diff options
| author | AndersBroman <anders.broman@ericsson.com> | 2017-03-02 16:17:56 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2017-03-02 15:20:05 +0000 |
| commit | 2f6ba7534721d643fca84bfce80712daa4fffa3d (patch) | |
| tree | 348f08b993f5d286378669a7e897e090b38435e8 /epan/dissectors/packet-zbee-nwk.c | |
| parent | bf28bd4da3c163234dbdccf492601853b697073d (diff) | |
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/dissectors/packet-zbee-nwk.c')
| -rw-r--r-- | epan/dissectors/packet-zbee-nwk.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/epan/dissectors/packet-zbee-nwk.c b/epan/dissectors/packet-zbee-nwk.c index c6ea51afdc..667eafb716 100644 --- a/epan/dissectors/packet-zbee-nwk.c +++ b/epan/dissectors/packet-zbee-nwk.c @@ -36,6 +36,7 @@ #include "packet-zbee.h" #include "packet-zbee-nwk.h" #include "packet-zbee-security.h" +#include <wsutil/glib-compat.h> /*************************/ /* Function Declarations */ @@ -2243,12 +2244,7 @@ static void free_keyring_key(gpointer key) static void free_keyring_val(gpointer a) { GSList **slist = (GSList **)a; -#if GLIB_CHECK_VERSION(2, 28, 0) g_slist_free_full(*slist, g_free); -#else - g_slist_foreach(*slist, (GFunc)g_free, NULL); - g_slist_free(*slist); -#endif /* GLIB_CHECK_VERSION(2, 28, 0) */ g_free(slist); } |