diff options
author | Anders Broman <anders.broman@ericsson.com> | 2008-03-21 16:10:47 +0000 |
---|---|---|
committer | Anders Broman <anders.broman@ericsson.com> | 2008-03-21 16:10:47 +0000 |
commit | 1a2b14d60c1aa8a5576b04b67f2cefda36196220 (patch) | |
tree | df827041b18259a7c37980e9c02b550236bdbcfd /epan/dfilter | |
parent | 0859a2be013d0ee484cff90f59fa66a5d71c2762 (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 'epan/dfilter')
-rw-r--r-- | epan/dfilter/dfilter-int.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/epan/dfilter/dfilter-int.h b/epan/dfilter/dfilter-int.h index aa3f4831c4..e316ab816a 100644 --- 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*); |