osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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.

svn path=/trunk/; revision=24718
This commit is contained in:
Jaap Keuter 2008-03-23 08:58:52 +00:00
parent e843df87f6
commit 098d297303
5 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
epan/Makefile.am
View File

@ -168,7 +168,7 @@ LEMON=../tools/lemon
dtd_grammar.h: dtd_grammar.c
dtd_grammar.c: dtd_grammar.lemon $(LEMON)/lemon$(EXEEXT)
dtd_grammar.c: $(LEMON)/lemon$(EXEEXT) $(srcdir)/$(LEMON)/lempar.c $(srcdir)/dtd_grammar.lemon
$(LEMON)/lemon$(EXEEXT) t=$(srcdir)/$(LEMON)/lempar.c $(srcdir)/dtd_grammar.lemon
tvbtest.o exntest.o: exceptions.h

2
epan/Makefile.nmake
View File

@ -301,6 +301,6 @@ uat_load.obj : uat_load.c
LEMON=..\tools\lemon
dtd_grammar.h: dtd_grammar.c
dtd_grammar.c: dtd_grammar.lemon $(LEMON)\lemon.exe
dtd_grammar.c: $(LEMON)\lemon.exe $(LEMON)\lempar.c dtd_grammar.lemon
$(LEMON)\lemon t=$(LEMON)\lempar.c dtd_grammar.lemon

2
epan/dfilter/Makefile.am
View File

@ -105,6 +105,6 @@ scanner_lex.h : scanner.c
LEMON=../../tools/lemon
grammar.h : grammar.c
grammar.c : grammar.lemon $(LEMON)/lemon$(EXEEXT)
grammar.c : $(LEMON)/lemon$(EXEEXT) $(srcdir)/$(LEMON)/lempar.c $(srcdir)/grammar.lemon
$(LEMON)/lemon$(EXEEXT) t=$(srcdir)/$(LEMON)/lempar.c $(srcdir)/grammar.lemon || \
(rm -f grammar.c grammar.h ; false)

2
epan/dfilter/Makefile.nmake
View File

@ -68,7 +68,7 @@ scanner_lex.h : scanner.c
scanner.obj : scanner.c grammar.h
grammar.h : grammar.c
grammar.c : grammar.lemon $(LEMON)\lemon.exe
grammar.c : $(LEMON)\lemon.exe $(LEMON)\lempar.c grammar.lemon
$(LEMON)\lemon.exe t=$(LEMON)\lempar.c grammar.lemon
$(LEMON)\lemon.exe:

6
tools/lemon/lempar.c
View File

@ -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;
}