aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorAnders Broman <anders.broman@ericsson.com>2008-03-21 16:10:47 +0000
committerAnders Broman <anders.broman@ericsson.com>2008-03-21 16:10:47 +0000
commit1a2b14d60c1aa8a5576b04b67f2cefda36196220 (patch)
treedf827041b18259a7c37980e9c02b550236bdbcfd /plugins
parent0859a2be013d0ee484cff90f59fa66a5d71c2762 (diff)
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; svn path=/trunk/; revision=24710
Diffstat (limited to 'plugins')
-rw-r--r--plugins/mate/mate_parser.l4
1 files changed, 4 insertions, 0 deletions
diff --git a/plugins/mate/mate_parser.l b/plugins/mate/mate_parser.l
index ca3a5ff3a7..f3a190407b 100644
--- 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*);