osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Anders Broman 2008-03-21 16:10:47 +00:00
parent 0859a2be01
commit 1a2b14d60c
3 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
epan/dfilter/dfilter-int.h
View File

@ -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*);

4
epan/dtd_parse.h
View File

@ -27,7 +27,11 @@
*/
extern void DtdParse(void*,int,dtd_token_data_t*,dtd_build_data_t*);
#if (GLIB_MAJOR_VERSION > 2 || (GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION >= 16))
extern void *DtdParseAlloc(void *(*)(gsize));
#else
extern void *DtdParseAlloc(void *(*)(gulong));
#endif
extern void DtdParseFree( void*, void(*)(void*) );
extern void DtdParseTrace(FILE *TraceFILE, char *zTracePrompt);
extern int Dtd_Parse_lex(void);

4
plugins/mate/mate_parser.l
View File

@ -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*);