summaryrefslogtreecommitdiff
path: root/epan/tap.c
diff options
context:
space:
mode:
authorAndersBroman <anders.broman@ericsson.com>2017-03-02 16:17:56 +0100
committerAnders Broman <a.broman58@gmail.com>2017-03-02 15:20:05 +0000
commit2f6ba7534721d643fca84bfce80712daa4fffa3d (patch)
tree348f08b993f5d286378669a7e897e090b38435e8 /epan/tap.c
parentbf28bd4da3c163234dbdccf492601853b697073d (diff)
downloadwireshark-2f6ba7534721d643fca84bfce80712daa4fffa3d.tar.gz
Use glib-compat
Change-Id: I510af18d433c4db360243dda72260e59eb84355f Reviewed-on: https://code.wireshark.org/review/20336 Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/tap.c')
-rw-r--r--epan/tap.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/epan/tap.c b/epan/tap.c
index 77e6ffcaa7..87f46aca38 100644
--- a/epan/tap.c
+++ b/epan/tap.c
@@ -40,6 +40,7 @@
#include <epan/dfilter/dfilter.h>
#include <epan/tap.h>
#include <wsutil/ws_printf.h> /* ws_g_warning */
+#include <wsutil/glib-compat.h>
static gboolean tapping_is_active=FALSE;
@@ -772,12 +773,7 @@ void tap_cleanup(void)
}
#ifdef HAVE_PLUGINS
-#if GLIB_CHECK_VERSION(2, 28, 0)
g_slist_free_full(tap_plugins, tap_plugin_destroy);
-#else
- g_slist_foreach(tap_plugins, (GFunc)tap_plugin_destroy, NULL);
- g_slist_free(tap_plugins);
-#endif
#endif /* HAVE_PLUGINS */
}