diff options
author | Anders Broman <anders.broman@ericsson.com> | 2009-07-24 13:50:57 +0000 |
---|---|---|
committer | Anders Broman <anders.broman@ericsson.com> | 2009-07-24 13:50:57 +0000 |
commit | 2e2986835745dd58e680247ade46e699a8ce1395 (patch) | |
tree | ec4595677ee31fd2b8f28555bfc24d917b9e839b /cfile.h | |
parent | 9bf46cd28630c680b314bc79752174437e782b22 (diff) | |
download | wireshark-2e2986835745dd58e680247ade46e699a8ce1395.tar.gz wireshark-2e2986835745dd58e680247ade46e699a8ce1395.tar.bz2 wireshark-2e2986835745dd58e680247ade46e699a8ce1395.zip |
Use g_slice if glib >=2.10
svn path=/trunk/; revision=29187
Diffstat (limited to 'cfile.h')
-rw-r--r-- | cfile.h | 7 |
1 files changed, 7 insertions, 0 deletions
@@ -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 */ |