From 75c64234402e5e4de8ecc7b3bb20d7ad35a9f2ac Mon Sep 17 00:00:00 2001 From: wmeier Date: Fri, 25 Apr 2008 17:40:29 +0000 Subject: 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] git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25173 f5534014-38df-0310-8fa8-9805f1628bb7 --- epan/uat_load.l | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'epan/uat_load.l') 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,8 +1,3 @@ -/* - * 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. */ @@ -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; +} -- cgit v1.2.3