From 2e2986835745dd58e680247ade46e699a8ce1395 Mon Sep 17 00:00:00 2001 From: Anders Broman Date: Fri, 24 Jul 2009 13:50:57 +0000 Subject: Use g_slice if glib >=2.10 svn path=/trunk/; revision=29187 --- cfile.h | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'cfile.h') diff --git a/cfile.h b/cfile.h index 1d28d0749b..122886b776 100644 --- a/cfile.h +++ b/cfile.h @@ -75,7 +75,14 @@ typedef struct _capture_file { /* packet data */ union wtap_pseudo_header pseudo_header; /* Packet pseudo_header */ guint8 pd[WTAP_MAX_PACKET_SIZE]; /* Packet data */ + /* memory chunks have been deprecated in favor of the slice allocator, + * which has been added in 2.10 + */ +#if GLIB_CHECK_VERSION(2,10,0) + +#else GMemChunk *plist_chunk; /* Memory chunk for frame_data structures */ +#endif frame_data *plist; /* Packet list */ frame_data *plist_end; /* Last packet in list */ frame_data *first_displayed; /* First frame displayed */ -- cgit v1.2.1