diff options
author | etxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-07-24 13:50:57 +0000 |
---|---|---|
committer | etxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-07-24 13:50:57 +0000 |
commit | dbbdca932aee87cee9c8ed928b133346551bc2d3 (patch) | |
tree | ec4595677ee31fd2b8f28555bfc24d917b9e839b /cfile.h | |
parent | d1559b4207a6c3814e362f8d1d8680b91b6ff369 (diff) |
Use g_slice if glib >=2.10
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@29187 f5534014-38df-0310-8fa8-9805f1628bb7
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 */ |