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>
wireshark · Dec 2, 2016 · 6f37317 · 6f37317
1 parent 2ec9093
commit 6f37317
Show file tree

Hide file tree

Showing 12 changed files with 60 additions and 19 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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>