diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2019-01-25 10:49:37 +0100 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2019-01-25 10:49:37 +0100 |
| commit | 404ebe62622150e77e311777dff8617eb974e834 (patch) | |
| tree | cc7f73d3e435d5b3ee85e2bef833e8de1fb133e3 /src/ndisc | |
| parent | 227c401a10a930af6fd5f123aef345fcd130d6aa (diff) | |
| parent | 3626b425d1bc017fdc6f1ea0cfd329d1e1681641 (diff) | |
Merge remote-tracking branch 'salsa/upstream' into upstream
Diffstat (limited to 'src/ndisc')
| -rw-r--r-- | src/ndisc/nm-ndisc.c | 2 | ||||
| -rw-r--r-- | src/ndisc/tests/meson.build | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/ndisc/nm-ndisc.c b/src/ndisc/nm-ndisc.c index f701731b..1dd8398c 100644 --- a/src/ndisc/nm-ndisc.c +++ b/src/ndisc/nm-ndisc.c @@ -1278,7 +1278,7 @@ set_property (GObject *object, guint prop_id, switch (prop_id) { case PROP_PLATFORM: /* construct-only */ - priv->platform = g_value_get_object (value) ? : NM_PLATFORM_GET; + priv->platform = g_value_get_object (value) ?: NM_PLATFORM_GET; if (!priv->platform) g_return_if_reached (); diff --git a/src/ndisc/tests/meson.build b/src/ndisc/tests/meson.build index 2f479c2d..e0dc9aa6 100644 --- a/src/ndisc/tests/meson.build +++ b/src/ndisc/tests/meson.build @@ -3,8 +3,7 @@ test_unit = 'test-ndisc-fake' exe = executable( test_unit, test_unit + '.c', - dependencies: test_nm_dep, - c_args: test_cflags_platform + dependencies: test_nm_dep_fake, ) test( @@ -18,6 +17,5 @@ test = 'test-ndisc-linux' exe = executable( test, test + '.c', - dependencies: test_nm_dep, - c_args: test_cflags_platform + dependencies: test_nm_dep_linux, ) |