diff options
author | Stephen Fisher <steve@stephen-fisher.com> | 2008-04-07 05:22:54 +0000 |
---|---|---|
committer | Stephen Fisher <steve@stephen-fisher.com> | 2008-04-07 05:22:54 +0000 |
commit | 726a1caaf1c717a5784beb2fb5a05900552563f0 (patch) | |
tree | 3f861f04f60e8872bcf7f82f56de654af93a7590 /tools | |
parent | 545d54ae745aa147ffa2e883dd0b982b56f86761 (diff) | |
download | wireshark-726a1caaf1c717a5784beb2fb5a05900552563f0.tar.gz |
- Remove GLIB1 code
- Change ugly GLIB version checking statements to GLIB_CHECK_VERSION
- Remove ws_strsplit files because we no longer need to borrow GLIB2's
g_strsplit code for the no longer supported GLIB1 builds
svn path=/trunk/; revision=24829
Diffstat (limited to 'tools')
-rw-r--r-- | tools/lemon/lempar.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/lemon/lempar.c b/tools/lemon/lempar.c index 97074b5635..58b6b84b11 100644 --- a/tools/lemon/lempar.c +++ b/tools/lemon/lempar.c @@ -252,7 +252,7 @@ const char *ParseTokenName(int tokenType){ ** A pointer to a parser. This pointer is used in subsequent calls ** to Parse and ParseFree. */ -#if (GLIB_MAJOR_VERSION > 2 || (GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION >= 16)) +#if GLIB_CHECK_VERSION(2,16,0) void *ParseAlloc(void *(*mallocProc)(gsize)){ yyParser *pParser; pParser = (yyParser*)(*mallocProc)( (gsize)sizeof(yyParser) ); |