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

1 files changed, 11 insertions, 10 deletions

diff --git a/epan/diam_dict.l b/epan/diam_dict.l
index 1927845689..e6478d5e9a 100644
--- a/epan/diam_dict.l
+++ b/epan/diam_dict.l
@@ -1,14 +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
-
-/*
  * We don't read from the terminal.
  */
 %option never-interactive
@@ -806,6 +796,17 @@ void ddict_print(FILE* fh, ddict_t* d) {
 	}
 }
 
+/*
+ * 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;
+}
+
 #ifdef TEST_DIAM_DICT_STANDALONE
 int main(int argc, char** argv) {
 	ddict_t* d;