Include config.h at the very beginning of all Flex scanners.

That way, if we #define anything for large file support, that's done
before we include any system header files that either depend on that
definition or that define it themselves if it's not already defined.

Change-Id: I9b07344151103be337899dead44d6960715d6813
Reviewed-on: https://code.wireshark.org/review/19035
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Guy Harris <guy@alum.mit.edu>

diff --git a/epan/dfilter/scanner.l b/epan/dfilter/scanner.l
index b6c960524374df2e183b483e7e41d9e6057addf8..8f5f96a25d2364396ad712e0b6c485c5100ad0bf 100644 (file)
--- a/epan/dfilter/scanner.l
+++ b/epan/dfilter/scanner.l
@@ -1,3 +1,8 @@
+%top {
+/* Include this before everything else, for various large-file definitions */
+#include "config.h"
+}
+
 /*
  * We want a reentrant scanner.
  */
@@ -68,8 +73,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include "config.h"
-
 #include <stdlib.h>
 #include <errno.h>
 

diff --git a/epan/diam_dict.l b/epan/diam_dict.l
index 7c4195caa8530887b2c2e26a7c8617942d526f64..e959793c6d2bdc29e094b35a92f02b5cf7e9da2b 100644 (file)
--- a/epan/diam_dict.l
+++ b/epan/diam_dict.l
@@ -1,3 +1,8 @@
+%top {
+/* Include this before everything else, for various large-file definitions */
+#include "config.h"
+}
+
 /*
  * We want a reentrant scanner.
  */
@@ -82,8 +87,6 @@
         ** Boston, MA  02110-1301, USA.
         */
 
-#include "config.h"
-
 #include <glib.h>
 #include <stdio.h>
 #include <string.h>

diff --git a/epan/dtd_parse.l b/epan/dtd_parse.l
index ae67cd4a5d1e967f14a9349c4eec0f1d9834b550..1c8434f5fb503977be278f35c5d6ec4639bdb8f9 100644 (file)
--- a/epan/dtd_parse.l
+++ b/epan/dtd_parse.l
@@ -1,3 +1,8 @@
+%top {
+/* Include this before everything else, for various large-file definitions */
+#include "config.h"
+}
+
 /*
  * We want a reentrant scanner.
  */
@@ -76,8 +81,6 @@
        * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
        */
 
-#include "config.h"
-
 #include <glib.h>
 #include <string.h>
 

diff --git a/epan/dtd_preparse.l b/epan/dtd_preparse.l
index f51f1c7f7a50cae6a593c61a3512bcce08e39c15..e3d0c6d9a33a1cbae6cf58bfb2cdd98832d68ee2 100644 (file)
--- a/epan/dtd_preparse.l
+++ b/epan/dtd_preparse.l
@@ -1,3 +1,8 @@
+%top {
+/* Include this before everything else, for various large-file definitions */
+#include "config.h"
+}
+
 /*
  * We want a reentrant scanner.
  */
@@ -85,8 +90,6 @@
         * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
         */
 
-#include "config.h"
-
 #include <glib.h>
 #include <string.h>
 #include <errno.h>

diff --git a/epan/radius_dict.l b/epan/radius_dict.l
index 656086e59e5994c27191dba9c1075a19990c703b..2d446b1a8e7b84ab3a61f78a01b3d0111f7eadbe 100644 (file)
--- a/epan/radius_dict.l
+++ b/epan/radius_dict.l
@@ -1,3 +1,8 @@
+%top {
+/* Include this before everything else, for various large-file definitions */
+#include "config.h"
+}
+
 /*
  * We want a reentrant scanner.
  */
@@ -78,8 +83,6 @@
        * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
        */
 
-#include "config.h"
-
 #include <glib.h>
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/epan/uat_load.l b/epan/uat_load.l
index ae8443de4dd0efdb8ba49be027550bec22b3e5f2..8c8af5452f126c153afc40dc1926d6046264a0db 100644 (file)
--- a/epan/uat_load.l
+++ b/epan/uat_load.l
@@ -1,3 +1,8 @@
+%top {
+/* Include this before everything else, for various large-file definitions */
+#include "config.h"
+}
+
 /*
  * We want a reentrant scanner.
  */
@@ -75,8 +80,6 @@
         * along with this program; if not, write to the Free Software
         * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
         */
-#include "config.h"
-
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>

diff --git a/plugins/mate/mate_parser.l b/plugins/mate/mate_parser.l
index 706900b839c4b358f690d025eab4db96e165dce5..b0b857ec2dc752d89cd372b8a31910aa3f587717 100644 (file)
--- a/plugins/mate/mate_parser.l
+++ b/plugins/mate/mate_parser.l
@@ -1,3 +1,8 @@
+%top {
+/* Include this before everything else, for various large-file definitions */
+#include "config.h"
+}
+
 /*
  * We want a reentrant scanner.
  */

diff --git a/plugins/wimaxasncp/wimaxasncp_dict.l b/plugins/wimaxasncp/wimaxasncp_dict.l
index be48324d4c37a47222d5a382a45a45b313bd9c3b..a1d16b33299e57ff566a98bd433dbef67377cb36 100644 (file)
--- a/plugins/wimaxasncp/wimaxasncp_dict.l
+++ b/plugins/wimaxasncp/wimaxasncp_dict.l
@@ -1,3 +1,8 @@
+%top {
+/* Include this before everything else, for various large-file definitions */
+#include "config.h"
+}
+
 /*
  * We want a reentrant scanner.
  */
@@ -83,8 +88,6 @@
         ** Boston, MA  02110-1301, USA.
         */
 
-#include "config.h"
-
 #include <glib.h>
 #include <stdio.h>
 #include <string.h>

diff --git a/text2pcap-scanner.l b/text2pcap-scanner.l
index 3c9f0b2498fe880dd34c2ca1f39a060ebc474814..e54e4279a983715024ae26bf723870e09d986855 100644 (file)
--- a/text2pcap-scanner.l
+++ b/text2pcap-scanner.l
@@ -1,5 +1,10 @@
 /* -*-mode: flex-*- */
 
+%top {
+/* Include this before everything else, for various large-file definitions */
+#include "config.h"
+}
+
 /*
  * We don't use input, so don't generate code for it.
  */

diff --git a/ui/text_import_scanner.l b/ui/text_import_scanner.l
index 740a38ea225f7d86be24642a5d7adbf7c1101622..5182b7fe8e23f94450439f29b9005a1a0eb6f403 100644 (file)
--- a/ui/text_import_scanner.l
+++ b/ui/text_import_scanner.l
@@ -1,5 +1,10 @@
 /* -*-mode: flex-*- */
 
+%top {
+/* Include this before everything else, for various large-file definitions */
+#include "config.h"
+}
+
 /*
  * We want a reentrant scanner.
  */
@@ -74,8 +79,6 @@
  *
  *******************************************************************************/
 
-#include "config.h"
-
 #include <stdio.h>
 #include <stdlib.h>
 

diff --git a/wiretap/ascend_scanner.l b/wiretap/ascend_scanner.l
index 887311ee54ba4664a7c89eccf9a9b125a82b9b4f..8eb37fd08ffbc94a4e932571cf187c347e2004b1 100644 (file)
--- a/wiretap/ascend_scanner.l
+++ b/wiretap/ascend_scanner.l
@@ -1,3 +1,8 @@
+%top {
+/* Include this before everything else, for various large-file definitions */
+#include "config.h"
+}
+
 /*
  * We want a reentrant scanner.
  */
@@ -64,8 +69,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include "config.h"
-
 #include <stdlib.h>
 #include <string.h>
 

diff --git a/wiretap/k12text.l b/wiretap/k12text.l
index d9b022ab88118a1a0bed7df7e123293f6d55c6b0..2667a89ab1555dbe2692e5aadc2aefa71fce27a4 100644 (file)
--- a/wiretap/k12text.l
+++ b/wiretap/k12text.l
@@ -1,3 +1,8 @@
+%top {
+/* Include this before everything else, for various large-file definitions */
+#include "config.h"
+}
+
 /*
  * We want a reentrant scanner.
  */
@@ -95,7 +100,6 @@
   *   - verify encapsulations
   */
 
-#include "config.h"
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>