Bug 2493: Fix (Part 3 of 3):

  To prevent Windows compiler errors when using flex 2.5.35.
  Ignore 'signed /unsigned mismatch' warnings


svn path=/trunk/; revision=25174

6 files changed, 37 insertions, 1 deletions

diff --git a/epan/dfilter/scanner.l b/epan/dfilter/scanner.l
index efcf4ce395..0855e7f29f 100644
--- a/epan/dfilter/scanner.l
+++ b/epan/dfilter/scanner.l
@@ -51,6 +51,12 @@
 #include "dfunctions.h"
 #include "scanner_lex.h"
 
+#ifdef _WIN32
+/* disable Windows VC compiler warning "signed/unsigned mismatch" associated  */
+/* with YY_INPUT code generated by flex versions such as 2.5.35.              */
+#pragma warning (disable:4018)
+#endif
+
 /*
  * GLib 1.2[.x] doesn't define G_MAXINT32 or G_MININT32; if they're not
  * defined, we define them as the maximum and minimum 32-bit signed
diff --git a/epan/dtd_preparse.l b/epan/dtd_preparse.l
index c73d722772..7a8fa5e8d0 100644
--- a/epan/dtd_preparse.l
+++ b/epan/dtd_preparse.l
@@ -84,6 +84,12 @@ static const gchar* location(void);
 #define YY_NO_UNISTD_H
 #endif
 
+#ifdef _WIN32
+/* disable Windows VC compiler warning "signed/unsigned mismatch" associated  */
+/* with YY_INPUT code generated by flex versions such as 2.5.35.              */
+#pragma warning (disable:4018)
+#endif
+
 %}
 xmlpi_start "<?"
 xmlpi_stop  "?>"
diff --git a/epan/radius_dict.l b/epan/radius_dict.l
index 677e039123..5fc91d0700 100644
--- a/epan/radius_dict.l
+++ b/epan/radius_dict.l
@@ -61,6 +61,12 @@
 #include "radius_dict_lex.h"
 #include <wiretap/file_util.h>
 
+#ifdef _WIN32
+/* disable Windows VC compiler warning "signed/unsigned mismatch" associated  */
+/* with YY_INPUT code generated by flex versions such as 2.5.35.              */
+#pragma warning (disable:4018)
+#endif
+
 #define ECHO
 #define MAX_INCLUDE_DEPTH 10
 
diff --git a/epan/uat_load.l b/epan/uat_load.l
index 1045d8e757..2df7df8aaa 100644
--- a/epan/uat_load.l
+++ b/epan/uat_load.l
@@ -61,6 +61,12 @@
 #include "uat_load_lex.h"
 #include <wiretap/file_util.h>
 
+#ifdef _WIN32
+/* disable Windows VC compiler warning "signed/unsigned mismatch" associated  */
+/* with YY_INPUT code generated by flex versions such as 2.5.35.              */
+#pragma warning (disable:4018)
+#endif
+
 	static uat_t* uat;
 	static guint colnum;
 	static gchar* ptr;
diff --git a/plugins/mate/mate_parser.l b/plugins/mate/mate_parser.l
index c58210e574..31d2fa4b88 100644
--- a/plugins/mate/mate_parser.l
+++ b/plugins/mate/mate_parser.l
@@ -47,7 +47,13 @@
 #include "mate.h"	
 #include "mate_grammar.h"
 #include "mate_parser_lex.h"
-	
+
+#ifdef _WIN32
+/* disable Windows VC compiler warning "signed/unsigned mismatch" associated  */
+/* with YY_INPUT code generated by flex versions such as 2.5.35.              */
+#pragma warning (disable:4018)
+#endif
+
 	void MateParser(void*,int, gchar*, mate_config* matecfg);
 #if (GLIB_MAJOR_VERSION > 2 || (GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION >= 16))
 	void *MateParserAlloc(void *(*)(gsize));
diff --git a/text2pcap-scanner.l b/text2pcap-scanner.l
index 90efadf4cf..ed81b23c8f 100644
--- a/text2pcap-scanner.l
+++ b/text2pcap-scanner.l
@@ -49,6 +49,12 @@
 #define YY_NO_UNISTD_H
 #endif    
 
+#ifdef _WIN32
+/* disable Windows VC compiler warning "signed/unsigned mismatch" associated  */
+/* with YY_INPUT code generated by flex versions such as 2.5.35.              */
+#pragma warning (disable:4018)
+#endif
+
 %}
 
 hexdigit [0-9A-Fa-f]