In glib 2.16 g_malloc Changed from:

- gpointer g_malloc         (gulong	 n_bytes) G_GNUC_MALLOC;
to:
+ gpointer g_malloc         (gsize	 n_bytes) G_GNUC_MALLOC;

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@24710 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/epan/dfilter/dfilter-int.h b/epan/dfilter/dfilter-int.h
index aa3f4831c41aa54e872d9f0c24016cd985c04eb4..e316ab816a1eb13adfd02a088c4bc26544154dad 100644 (file)
--- a/epan/dfilter/dfilter-int.h
+++ b/epan/dfilter/dfilter-int.h
@@ -57,7 +57,12 @@ typedef struct {
 } dfwork_t;
 
 /* Constructor/Destructor prototypes for Lemon Parser */
+#if (GLIB_MAJOR_VERSION > 2 || (GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION >= 16))
+void *DfilterAlloc(void* (*)(gsize));
+#else
 void *DfilterAlloc(void* (*)(gulong));
+#endif
+
 void DfilterFree(void*, void (*)(void *));
 void Dfilter(void*, int, stnode_t*, dfwork_t*);
 

diff --git a/epan/dtd_parse.h b/epan/dtd_parse.h
index f56caac21c976b132e3af0aedda7a07750416bdc..cd84aeaed9e746516ae1062c214910bcc99a64d3 100644 (file)
--- a/epan/dtd_parse.h
+++ b/epan/dtd_parse.h
@@ -27,7 +27,11 @@
 */
 
 extern void DtdParse(void*,int,dtd_token_data_t*,dtd_build_data_t*);
+#if (GLIB_MAJOR_VERSION > 2 || (GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION >= 16))
+extern void *DtdParseAlloc(void *(*)(gsize));
+#else
 extern void *DtdParseAlloc(void *(*)(gulong));
+#endif
 extern void DtdParseFree( void*, void(*)(void*) );
 extern void DtdParseTrace(FILE *TraceFILE, char *zTracePrompt);        
 extern int Dtd_Parse_lex(void);

diff --git a/plugins/mate/mate_parser.l b/plugins/mate/mate_parser.l
index ca3a5ff3a79dd950f6f7dbce3f8af67111616efa..f3a190407b24b14dc1d3223de1c70113ece5d2c3 100644 (file)
--- a/plugins/mate/mate_parser.l
+++ b/plugins/mate/mate_parser.l
@@ -54,7 +54,11 @@
 #include "mate_parser_lex.h"
        
        void MateParser(void*,int, gchar*, mate_config* matecfg);
+#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 MateParseTrace(FILE*,char*);