current swipe at header magic; int types be damned

diff --git a/configure.in b/configure.in
index ad154693f73d45ee835a61b95eff4b091661dd23..07cc8a3deae346989185254a4a470e88699f411f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -62,8 +62,8 @@ dnl checks for libraries
 dnl checks for header files
 
 AC_HEADER_STDC
-AC_CHECK_HEADERS(string.h sys/types.h unistd.h stdbool.h)
-AC_CHECK_HEADERS(cunistd netinet/in.h)
+AC_CHECK_HEADERS(sys/types.h unistd.h stdbool.h)
+AC_CHECK_HEADERS(cunistd)
 
 dnl checks for types
 

diff --git a/flex.skl b/flex.skl
index cc42d473ab1701dd9f6e34f5f037ed75d137ebf7..e232769c269cc61baa47b0e499d6aad73188f1eb 100644 (file)
--- a/flex.skl
+++ b/flex.skl
@@ -30,12 +30,11 @@ m4_changecom
 %#   edit the skeleton.
 %#
 #define FLEX_SCANNER
-#define YY_FLEX_VERSION VERSION
+#define YY_FLEX_MAJOR_VERSION FLEX_MAJOR_VERSION
+#define YY_FLEX_MINOR_VERSION FLEX_MINOR_VERSION
+#define YY_FLEX_SUBMINOR_VERSION FLEX_SUBMINOR_VERSION 
 
 /* First, we deal with  platform-specific or compiler-specific issues. */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
 
 /* begin standard C headers. */
 %push
@@ -46,20 +45,6 @@ m4_changecom
 #include <stdlib.h>
 
 /* We try to get some modern integral types defined */
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_INTTYPES_H
-#include <inttypes.h>
-#endif
-
-/* sometimes, inttypes.h doesn't do everything that we would have
-hoped, so we make sure we have what we need. We try to avoid
-redefinition warnings though. The idea is that if we have int8_t then
-we probably have the other int*_t types. The logic is similar with
-uint*_t types. */
-
-#ifndef HAVE_INT8_T
 
 /* Exact integral types.  */
 
@@ -74,9 +59,6 @@ typedef long int int64_t;
 # else
 __extension__ typedef long long int int64_t;
 # endif
-#endif /* ! HAVE_INT8_T */
-
-#ifndef HAVE_UINT8_T
 
 /* Unsigned.  */
 
@@ -89,7 +71,6 @@ typedef unsigned long int uint64_t;
 #else
 __extension__ typedef unsigned long long int uint64_t;
 #endif
-#endif /* ! HAVE_UINT8_T */
 
 /* Limits of integral types. */
 #ifndef INT8_MIN

diff --git a/flexdef.h b/flexdef.h
index f5e40fb2a122791e8b8a19d081ee41eff720b570..3dab6c4f9c4b8658588e0ad5340e60290aa241ee 100644 (file)
--- a/flexdef.h
+++ b/flexdef.h
@@ -1,3 +1,4 @@
+
 /* flexdef - definitions file for flex */
 
 /*  Copyright (c) 1990 The Regents of the University of California. */
@@ -51,7 +52,9 @@
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
-
+#ifdef HAVE_INTTYPES_H
+#include <inttypes.h>
+#endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
@@ -125,10 +128,6 @@
 
 #define unspecified -1
 
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-
 /* Special chk[] values marking the slots taking by end-of-buffer and action
  * numbers.
  */