diff options
| author | jake <jake@f5534014-38df-0310-8fa8-9805f1628bb7> | 2008-03-23 08:58:52 +0000 |
|---|---|---|
| committer | jake <jake@f5534014-38df-0310-8fa8-9805f1628bb7> | 2008-03-23 08:58:52 +0000 |
| commit | af8d47f5390756087a1765a77e8b80715e1b4d69 (patch) | |
| tree | 7e406e4f58ef201f51b1bb57f0349d489635cea5 /tools/lemon | |
| parent | 282d3cb35e63a0ecb8644d5345ebc09e8ebf8bdb (diff) | |
Running glib 2.16 on 32 bit platform requires this lempar.c change in addition to revision 24710.
Makefiles updated to make new lempar.c effective in build rules.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@24718 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'tools/lemon')
| -rw-r--r-- | tools/lemon/lempar.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tools/lemon/lempar.c b/tools/lemon/lempar.c index aaa7a8d2a5..97074b5635 100644 --- a/tools/lemon/lempar.c +++ b/tools/lemon/lempar.c @@ -252,9 +252,15 @@ 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)) +void *ParseAlloc(void *(*mallocProc)(gsize)){ + yyParser *pParser; + pParser = (yyParser*)(*mallocProc)( (gsize)sizeof(yyParser) ); +#else void *ParseAlloc(void *(*mallocProc)(gulong)){ yyParser *pParser; pParser = (yyParser*)(*mallocProc)( (gulong)sizeof(yyParser) ); +#endif if( pParser ){ pParser->yyidx = -1; } |