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

If YY_SKIP_YYWRAP is defined, don't bother defining WRAP_FUNC - with 

flex 2.5.31, WRAP_FUNC will end up being defined as a value that, when
used as a function-style macro, expands to 1, so the definition of
WRAP_FUNC will get a syntax error.

svn path=/trunk/; revision=22428
This commit is contained in:
Guy Harris 2007-07-31 01:24:26 +00:00
parent 9865b6346f
commit cab450519f
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tools/lemon/lemonflex-tail.inc
View File

@ -17,7 +17,9 @@ int MODNAME_wrap(void);
#define TEXT_FUNC CONCAT(MODNAME,_scanner_text)
#define FILE_FUNC CONCAT(MODNAME,_scanner_file)
#define CLEANUP_FUNC CONCAT(MODNAME,_scanner_cleanup)
#ifndef YY_SKIP_YYWRAP
#define WRAP_FUNC CONCAT(MODNAME,_wrap)
#endif
/* flex 2.5.31 no longer #defines these as yy_* if used with -P. */
#ifndef yy_scan_string
@ -61,15 +63,14 @@ CLEANUP_FUNC (void)
yy_delete_buffer(YY_CURRENT_BUFFER);
}
#ifndef YY_SKIP_YYWRAP
/* Flex has an option '%option noyywrap' so that I don't have to
* provide this yywrap function, but in order to maintain portability,
* I'll just use this yywrap() function.
* I'll just use this yywrap() function if that option wasn't used.
*/
int
WRAP_FUNC ()
WRAP_FUNC (void)
{
return 1; /* stop at EOF, instead of looking for next file */
}
#endif