diff options
author | Bill Meier <wmeier@newsguy.com> | 2008-04-25 17:40:29 +0000 |
---|---|---|
committer | Bill Meier <wmeier@newsguy.com> | 2008-04-25 17:40:29 +0000 |
commit | 0d4b874b44dd082eaa61b5b403069d0e3cd38453 (patch) | |
tree | c78189b236a540b92d55b797c7ec1bf798db3f76 /epan/uat_load.l | |
parent | ff523807655f111ba5ae1f84a030ee8a147c3997 (diff) |
Bug 2493: Fix (Part 2):
To prevent Windows compiler errors when using flex 2.5.35.
Fixes "missing unistd.h" and yywrap "mismatched parameter" warnings
[Upcoming Part 3: ignore 'signed /unsigned mismatch' errors]
svn path=/trunk/; revision=25173
Diffstat (limited to 'epan/uat_load.l')
-rw-r--r-- | epan/uat_load.l | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/epan/uat_load.l b/epan/uat_load.l index ec93d11100..1045d8e757 100644 --- a/epan/uat_load.l +++ b/epan/uat_load.l @@ -1,9 +1,4 @@ /* - * We want to stop processing when we get to the end of the input. - */ -%option noyywrap - -/* * We don't use unput, so don't generate code for it. */ %option nounput @@ -349,3 +344,14 @@ gboolean uat_load_str(uat_t* uat_in, char* entry, char** err) { return TRUE; } } + +/* + * We want to stop processing when we get to the end of the input. + * (%option noyywrap is not used because if used then + * some flex versions (eg: 2.5.35) generate code which causes + * warnings by the Windows VC compiler). + */ + +int yywrap(void) { + return 1; +} |