From 3626b425d1bc017fdc6f1ea0cfd329d1e1681641 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 24 Oct 2018 21:01:12 +0200 Subject: New upstream version 1.14.4 --- src/ndisc/nm-lndp-ndisc.c | 2 +- src/ndisc/tests/meson.build | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'src/ndisc') 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, ) -- cgit 1.3.0-6-gf8a5