Revert "Move the inclusion of config.h to the top of scanner.c"

This reverts commit 1dcc0d42a4afa488022d984db25db3cdae6b590a.

This is part of a move to require Flex 2.5.31 or later and to use
features in those versions of Flex, including %top.

diff --git a/Makefile.in b/Makefile.in
index 26020207e7553e36e72688c9777d97e718e799a8..c61539645be6886a08881868d34efe356014e045 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -430,9 +430,8 @@ libpcap.shareda: $(OBJ)
 libpcap.none:
 
 scanner.c: $(srcdir)/scanner.l
-       @rm -f $@ [email protected]
-       $(srcdir)/runlex.sh $(LEX) [email protected] $<
-       cat [email protected] [email protected] > $@
+       @rm -f $@
+       $(srcdir)/runlex.sh $(LEX) -o$@ $<
 
 scanner.o: scanner.c tokdefs.h
        $(CC) $(FULL_CFLAGS) -c scanner.c

diff --git a/scanner.c.top b/scanner.c.top
deleted file mode 100644 (file)
index c7cde56..0000000
--- a/scanner.c.top
+++ /dev/null
@@ -1,3 +0,0 @@
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif

diff --git a/scanner.l b/scanner.l
index 2c12cac5cba74b69bf362a6c4240cbd23d1d98a5..acc02a0a8be23fa41250aeea683330d98a1863c4 100644 (file)
--- a/scanner.l
+++ b/scanner.l
@@ -20,6 +20,10 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #ifdef _WIN32
   #include <pcap-stdinc.h>
 #else