Put the stuff to get the sized integer types defined into pcap-types.h.

Have pcap-types.h arrange to define the intN_t/u_intN_t types, and the
INTn_MAX/UINTn_MAX values, on all platforms, and use it wherever it's
appropriate.

Include it up front in scanner.l, to avoid redefinitions of the
INTn_MAX/UINTn_MAX types.

1 files changed, 1 insertions, 10 deletions

diff --git a/savefile.c b/savefile.c
index 695d7a20..4dd8f545 100644
--- a/savefile.c
+++ b/savefile.c
@@ -32,18 +32,9 @@
 #include <config.h>
 #endif
 
+#include <pcap-types.h>
 #ifdef _WIN32
 #include <pcap-stdinc.h>
-#else /* _WIN32 */
-#if HAVE_INTTYPES_H
-#include <inttypes.h>
-#elif HAVE_STDINT_H
-#include <stdint.h>
-#endif
-#ifdef HAVE_SYS_BITYPES_H
-#include <sys/bitypes.h>
-#endif
-#include <sys/types.h>
 #endif /* _WIN32 */
 
 #include <errno.h>