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:
parent
0859a2be01
commit
1a2b14d60c
|
@ -57,7 +57,12 @@ typedef struct {
|
||||||
} dfwork_t;
|
} dfwork_t;
|
||||||
|
|
||||||
/* Constructor/Destructor prototypes for Lemon Parser */
|
/* 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));
|
void *DfilterAlloc(void* (*)(gulong));
|
||||||
|
#endif
|
||||||
|
|
||||||
void DfilterFree(void*, void (*)(void *));
|
void DfilterFree(void*, void (*)(void *));
|
||||||
void Dfilter(void*, int, stnode_t*, dfwork_t*);
|
void Dfilter(void*, int, stnode_t*, dfwork_t*);
|
||||||
|
|
||||||
|
|
|
@ -27,7 +27,11 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
extern void DtdParse(void*,int,dtd_token_data_t*,dtd_build_data_t*);
|
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));
|
extern void *DtdParseAlloc(void *(*)(gulong));
|
||||||
|
#endif
|
||||||
extern void DtdParseFree( void*, void(*)(void*) );
|
extern void DtdParseFree( void*, void(*)(void*) );
|
||||||
extern void DtdParseTrace(FILE *TraceFILE, char *zTracePrompt);
|
extern void DtdParseTrace(FILE *TraceFILE, char *zTracePrompt);
|
||||||
extern int Dtd_Parse_lex(void);
|
extern int Dtd_Parse_lex(void);
|
||||||
|
|
|
@ -54,7 +54,11 @@
|
||||||
#include "mate_parser_lex.h"
|
#include "mate_parser_lex.h"
|
||||||
|
|
||||||
void MateParser(void*,int, gchar*, mate_config* matecfg);
|
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));
|
void *MateParserAlloc(void *(*)(gulong));
|
||||||
|
#endif
|
||||||
void MateParserFree( void*, void(*)(void*) );
|
void MateParserFree( void*, void(*)(void*) );
|
||||||
void MateParseTrace(FILE*,char*);
|
void MateParseTrace(FILE*,char*);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue