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, 18 insertions, 5 deletions

diff --git a/epan/dtd_preparse.l b/epan/dtd_preparse.l
index 988cd87281..c73d722772 100644
--- a/epan/dtd_preparse.l
+++ b/epan/dtd_preparse.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
@@ -82,6 +77,13 @@ static guint linenum;
 static gchar* replace_entity(gchar* s);
 static const gchar* location(void);
 
+/*
+ * Flex (v 2.5.35) uses this symbol to "exclude" unistd.h
+ */
+#ifdef _WIN32
+#define YY_NO_UNISTD_H
+#endif
+
 %}
 xmlpi_start "<?"
 xmlpi_stop  "?>"
@@ -217,3 +219,14 @@ extern GString* dtd_preparse(const gchar* dname,const  gchar* fname, GString* er
 
 	return output;
 }
+
+/*
+ * 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;
+}