Accomodate older flex versions.

Make scanner compilation more environment agnostic.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34897 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/gtk/Makefile.common b/gtk/Makefile.common
index 71cc72884d9292d59848f44095683bfb047c8b23..4be6a5fbf16b1a7b97261debffa9442293b82b2b 100644 (file)
--- a/gtk/Makefile.common
+++ b/gtk/Makefile.common
@@ -324,6 +324,7 @@ noinst_HEADERS = \
        supported_protos_dlg.h   \
        tap_dfilter_dlg.h       \
        text_import.h   \
+       text_import_scanner.h   \
        text_page_utils.h       \
        u3.h \
        uat_gui.h \

diff --git a/gtk/file_import_dlg.c b/gtk/file_import_dlg.c
index 2577da2283beb5a7acf44cd97f7f40608a98c55f..400dbe62a28e99345b7be0514c202d42428f47d6 100644 (file)
--- a/gtk/file_import_dlg.c
+++ b/gtk/file_import_dlg.c
@@ -56,6 +56,7 @@
 
 #include "gtk/file_import_dlg.h"
 #include "gtk/text_import.h"
+#include "gtk/text_import_scanner.h"
 
 #include "file.h"
 #include "wsutil/file_util.h"
@@ -501,7 +502,8 @@ file_import_open(text_import_info_t *info)
 
     text_import_setup(info);
 
-    text_importset_in(info->import_text_file);
+    text_importin = info->import_text_file;
+    
     text_importlex();
 
     text_import_cleanup();

diff --git a/gtk/text_import.c b/gtk/text_import.c
index 036d266da224920a890c2ca177565c6b2233e368..2fe6e34e4408bbb15d1cee9d9fd9fa8baaa4e39c 100644 (file)
--- a/gtk/text_import.c
+++ b/gtk/text_import.c
@@ -132,6 +132,7 @@
 #endif
 
 #include "text_import.h"
+#include "text_import_scanner.h"
 
 /*--- Options --------------------------------------------------------------------*/
 

diff --git a/gtk/text_import.h b/gtk/text_import.h
index 651893622eabea7541c6aecf355d3e069d62c911..f85daef5191d4444d85be6d7b2cd895cbea0ff5f 100644 (file)
--- a/gtk/text_import.h
+++ b/gtk/text_import.h
@@ -84,20 +84,4 @@ typedef struct
 void text_import_setup(text_import_info_t *info);
 void text_import_cleanup();
 
-/* The lexical parser interface */
-
-typedef enum {
-    T_BYTE = 1,
-    T_OFFSET,
-    T_DIRECTIVE,
-    T_TEXT,
-    T_EOL
-} token_t;
-
-void parse_token(token_t token, char *str);
-void write_current_packet(void);
-
-void text_importset_in(FILE *input_file);
-int text_importlex(void);
-
 #endif

diff --git a/gtk/text_import_scanner.h b/gtk/text_import_scanner.h
new file mode 100644 (file)
index 0000000..70eba44
--- /dev/null
+++ b/gtk/text_import_scanner.h
@@ -0,0 +1,50 @@
+/**-*-C-*-**********************************************************************
+ * text_import_scanner.h
+ * Scanner for text import
+ * November 2010, Jaap Keuter <jaap.keuter@xs4all.nl>
+ *
+ * $Id$
+ *
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * Based on text2pcap.h by Ashok Narayanan <ashokn@cisco.com>
+ *
+ * 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.
+ *
+ *******************************************************************************/
+
+
+#ifndef TEXT_IMPORT_SCANNER_H
+#define TEXT_IMPORT_SCANNER_H
+
+typedef enum {
+    T_BYTE = 1,
+    T_OFFSET,
+    T_DIRECTIVE,
+    T_TEXT,
+    T_EOL
+} token_t;
+
+
+void parse_token(token_t token, char *str);
+void write_current_packet(void);
+
+extern FILE *text_importin;
+
+int text_importlex(void);
+
+#endif

diff --git a/gtk/text_import_scanner.l b/gtk/text_import_scanner.l
index 81a9e59a4c67cb4b8179650e1a9499e3eaa68954..1e0c80a56c9b4c60de12952c28fbd1df9cb9305e 100644 (file)
--- a/gtk/text_import_scanner.l
+++ b/gtk/text_import_scanner.l
@@ -51,7 +51,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "text_import.h"
+#include "text_import_scanner.h"
 
 /*
  * Flex (v 2.5.35) uses this symbol to "exclude" unistd.h