Another unnecessary include of io.h.

[metze/wireshark/wip.git] / text2pcap-scanner.l

diff --git a/text2pcap-scanner.l b/text2pcap-scanner.l
index 725926df82c1624bc5f81b593245ca7d2239f564..d1871cdfdd3a62386a07e42534101ea835978731 100644 (file)
--- a/text2pcap-scanner.l
+++ b/text2pcap-scanner.l
@@ -1,7 +1,22 @@
 /* -*-mode: flex-*- */
 
+/*
+ * We don't use input, so don't generate code for it.
+ */
+%option noinput
+
+/*
+ * We don't use unput, so don't generate code for it.
+ */
+%option nounput
+
+/*
+ * We don't read interactively from the terminal.
+ */
+%option never-interactive
+
 %{
-    
+
 /********************************************************************************
  *
  * text2pcap-scanner.l
@@ -10,54 +25,57 @@
  *
  * (c) Copyright 2001 Ashok Narayanan <ashokn@cisco.com>
  *
- * $Id$
- * 
  * Wireshark - Network traffic analyzer
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
- * 
- * 
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  *******************************************************************************/
-    
+
 #include <stdio.h>
 #include <stdlib.h>
 
 #include "text2pcap.h"
-    
+
+/*
+ * Flex (v 2.5.35) uses this symbol to "exclude" unistd.h
+ */
+#ifdef _WIN32
+#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]
 directive #TEXT2PCAP.*
 comment #[^W].*
 byte [0-9A-Fa-f][0-9A-Fa-f][ \t]
-byte_eol [0-9A-Fa-f][0-9A-Fa-f]\n
+byte_eol [0-9A-Fa-f][0-9A-Fa-f]\r?\n
 offset [0-9A-Fa-f]+[: \t]
-offset_eol [0-9A-Fa-f]+\n
+offset_eol [0-9A-Fa-f]+\r?\n
 text [^ \n\t]+
 mailfwd >
 eol \r?\n\r?
 
-/* we don't use unput, so don't generate code for it.
- * This is flex-only, but current thinking is that our lexers don't work
- * with non-flex anyway...
- */
-%option nounput
-
 %%
 
 {byte}            { parse_token(T_BYTE, yytext); }
@@ -73,7 +91,7 @@ eol \r?\n\r?
 
 %%
 
-int yywrap()
+int yywrap(void)
 {
     return 1;
 }