From 559952b9030e6221dfccaf5ff2d1c85a24f2825f Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Wed, 10 May 2017 13:39:17 -0700 Subject: Clean up MateParser routine declarations. Remove the declarations from mate_parser.l, and have mate_parser.h include mate.h at the beginning of the file, instead. Move the #if'ed version of the declaration of MateParserAlloc() to mate.h. Change-Id: I03ffdd5f093b179ffc0cb0e43eac093f7e4af65c Reviewed-on: https://code.wireshark.org/review/21587 Reviewed-by: Guy Harris --- plugins/mate/mate.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'plugins/mate/mate.h') diff --git a/plugins/mate/mate.h b/plugins/mate/mate.h index 191c6600fe..0dc0bcaff5 100644 --- a/plugins/mate/mate.h +++ b/plugins/mate/mate.h @@ -381,8 +381,11 @@ extern gchar* add_ranges(gchar* range, GPtrArray* range_ptr_arr); extern gboolean mate_load_config(const gchar* filename, mate_config* mc); /* Constructor/Destructor prototypes for Lemon Parser */ +#if (GLIB_MAJOR_VERSION > 2 || (GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION >= 16)) void *MateParserAlloc(void* (*)(gsize)); - +#else +void *MateParserAlloc(void* (*)(gulong)); +#endif void MateParserFree(void*, void (*)(void *)); void MateParser(void*, int, gchar*, mate_config*); -- cgit v1.2.3