diff options
| author | Michael Biebl <biebl@debian.org> | 2018-10-24 21:02:52 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2018-10-24 21:02:52 +0200 |
| commit | f87c30ac3b55627a166953aec4de552f5a8c5a53 (patch) | |
| tree | 1eb82dba7af28b0504403e2aacaeaf927d14065c /src/ndisc | |
| parent | bf9fe831a32fc90b956ee777b629adaf6df49d65 (diff) | |
| parent | 3626b425d1bc017fdc6f1ea0cfd329d1e1681641 (diff) | |
Update upstream source from tag 'upstream/1.14.4'
Update to upstream version '1.14.4' with Debian dir 3e8398be8782c0495d64cae17094a6b9e5e62907
Diffstat (limited to 'src/ndisc')
| -rw-r--r-- | src/ndisc/nm-lndp-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-lndp-ndisc.c b/src/ndisc/nm-lndp-ndisc.c index 9f427d4d..e1003ad1 100644 --- a/src/ndisc/nm-lndp-ndisc.c +++ b/src/ndisc/nm-lndp-ndisc.c @@ -491,7 +491,7 @@ receive_rs (struct ndp *ndp, struct ndp_msg *msg, gpointer user_data) static gboolean event_ready (GIOChannel *source, GIOCondition condition, NMNDisc *ndisc) { - gs_unref_object NMNDisc *ndisc_keep_alive = g_object_ref (ndisc); + _nm_unused gs_unref_object NMNDisc *ndisc_keep_alive = g_object_ref (ndisc); nm_auto_pop_netns NMPNetns *netns = NULL; NMLndpNDiscPrivate *priv = NM_LNDP_NDISC_GET_PRIVATE ((NMLndpNDisc *) ndisc); 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, ) |