The only place where we care about zlib is file_wrappers.c; include

<zlib.h> there, rather than wtap-int.h.  That obviates the need to
include config.h earlier in ascend_scanner.l; revert the previous
change, so we don't require a version of Flex that supports %top.

svn path=/trunk/; revision=37640

wiretap/ascend_scanner.l

@@ -9,8 +9,8 @@
  */
 %option prefix="ascend"
 
-%top{
-/* Generated from ascend_scanner.l
+%{
+/* ascend_scanner.l
  *
  * $Id$
  *
@@ -35,9 +35,7 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
-}
 
-%{
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

wiretap/file_wrappers.c

@@ -59,6 +59,10 @@
 #include "file_wrappers.h"
 #include <wsutil/file_util.h>
 
+#ifdef HAVE_LIBZ
+#include <zlib.h>
+#endif /* HAVE_LIBZ */
+
 /*
  * See RFC 1952 for a description of the gzip file format.
  *

wiretap/wtap-int.h

@@ -35,10 +35,6 @@
 #include <winsock2.h>
 #endif
 
-#ifdef HAVE_LIBZ
-#include <zlib.h>
-#endif /* HAVE_LIBZ */
-
 #include <wsutil/file_util.h>
 
 #include "wtap.h"