Makefile.in: don't remove configure and config.h.in in make distclean.

[tcpdump] / netdissect-stdinc.h

diff --git a/netdissect-stdinc.h b/netdissect-stdinc.h
index 3e85e8258409d2f5a4defbbd9689a689fb82c687..e81c90bd590b080dfb3f66ef24dfc5ae982d90b8 100644 (file)
--- a/netdissect-stdinc.h
+++ b/netdissect-stdinc.h
@@ -39,6 +39,8 @@
 #ifndef netdissect_stdinc_h
 #define netdissect_stdinc_h
 
+#include "ftmacros.h"
+
 #include <errno.h>
 
 #include "compiler-tests.h"
@@ -46,6 +48,9 @@
 #include "varattrs.h"
 
 /*
+ * If we're compiling with Visual Studio, make sure we have at least
+ * VS 2015 or later, so we have sufficient C99 support.
+ *
  * XXX - verify that we have at least C99 support on UN*Xes?
  *
  * What about MinGW or various DOS toolchains?  We're currently assuming
@@ -80,6 +85,9 @@
    */
 
   /*
+   * Include <inttypes.h> to get the integer types and PRi[doux]64 values
+   * defined.
+   *
    * If the compiler is MSVC, we require VS 2015 or newer, so we
    * have <inttypes.h> - and support for %zu in the formatted
    * printing functions.
@@ -118,7 +126,6 @@
 #include <stdio.h>
 #include <winsock2.h>
 #include <ws2tcpip.h>
-#include <ctype.h>
 #include <time.h>
 #include <io.h>
 #include <fcntl.h>
@@ -157,16 +164,21 @@
    * by adding a preceding underscore; we *want* the UN*Xisms, so add
    * #defines to let us use them.
    */
-  #define isascii __isascii
   #define isatty _isatty
   #define stat _stat
   #define strdup _strdup
   #define open _open
-  #define fstat _fstat
   #define read _read
   #define close _close
   #define O_RDONLY _O_RDONLY
 
+  /*
+   * We define our_fstat64 as _fstati64, and define our_statb as
+   * struct _stati64, so we get 64-bit file sizes.
+   */
+  #define our_fstat _fstati64
+  #define our_statb struct _stati64
+
   /*
    * If <crtdbg.h> has been included, and _DEBUG is defined, and
    * __STDC__ is zero, <crtdbg.h> will define strdup() to call
@@ -205,7 +217,7 @@
 #endif
 
 #ifndef caddr_t
-typedef char* caddr_t;
+typedef char *caddr_t;
 #endif /* caddr_t */
 
 #define MAXHOSTNAMELEN 64
@@ -216,7 +228,6 @@ typedef char* caddr_t;
  * Includes and definitions for various flavors of UN*X.
  */
 
-#include <ctype.h>
 #include <unistd.h>
 #include <netdb.h>
 #include <sys/param.h>
@@ -229,6 +240,13 @@ typedef char* caddr_t;
 
 #include <arpa/inet.h>
 
+/*
+ * We should have large file support enabled, if it's available,
+ * so just use fstat as our_fstat and struct stat as our_statb.
+ */
+#define our_fstat fstat
+#define our_statb struct stat
+
 /*
  * Assume all UN*Xes have strtoll(), and use it for strtoint64_t().
  */
@@ -238,7 +256,6 @@ typedef char* caddr_t;
  * Assume LL works.
  */
 #define INT64_T_CONSTANT(constant)     (constant##LL)
-
 #endif /* _WIN32 */
 
 /*
@@ -340,70 +357,6 @@ struct in6_addr {
 #define FALSE 0
 #endif
 
-/*
- * The Apple deprecation workaround macros below were adopted from the
- * FreeRADIUS server code under permission of Alan DeKok and Arran Cudbard-Bell.
- */
-
-#define XSTRINGIFY(x) #x
-
-/*
- *     Macros for controlling warnings in GCC >= 4.2 and clang >= 2.8
- */
-#define DIAG_JOINSTR(x,y) XSTRINGIFY(x ## y)
-#define DIAG_DO_PRAGMA(x) _Pragma (#x)
-
-/*
- * The current clang compilers also define __GNUC__ and __GNUC_MINOR__
- * thus we need to test the clang case before the GCC one
- */
-#if defined(__clang__)
-#  if (__clang_major__ * 100) + __clang_minor__ >= 208
-#    define DIAG_PRAGMA(x) DIAG_DO_PRAGMA(clang diagnostic x)
-#    define DIAG_OFF(x) DIAG_PRAGMA(push) DIAG_PRAGMA(ignored DIAG_JOINSTR(-W,x))
-#    define DIAG_ON(x) DIAG_PRAGMA(pop)
-#  else
-#    define DIAG_OFF(x)
-#    define DIAG_ON(x)
-#  endif
-#elif defined(__GNUC__) && ((__GNUC__ * 100) + __GNUC_MINOR__) >= 402
-#  define DIAG_PRAGMA(x) DIAG_DO_PRAGMA(GCC diagnostic x)
-#  if ((__GNUC__ * 100) + __GNUC_MINOR__) >= 406
-#    define DIAG_OFF(x) DIAG_PRAGMA(push) DIAG_PRAGMA(ignored DIAG_JOINSTR(-W,x))
-#    define DIAG_ON(x) DIAG_PRAGMA(pop)
-#  else
-#    define DIAG_OFF(x) DIAG_PRAGMA(ignored DIAG_JOINSTR(-W,x))
-#    define DIAG_ON(x)  DIAG_PRAGMA(warning DIAG_JOINSTR(-W,x))
-#  endif
-#else
-#  define DIAG_OFF(x)
-#  define DIAG_ON(x)
-#endif
-
-/* Use for clang specific warnings */
-#ifdef __clang__
-#  define DIAG_OFF_CLANG(x) DIAG_OFF(x)
-#  define DIAG_ON_CLANG(x)  DIAG_ON(x)
-#else
-#  define DIAG_OFF_CLANG(x)
-#  define DIAG_ON_CLANG(x)
-#endif
-
-/*
- *     For dealing with APIs which are only deprecated in OSX (like the OpenSSL API)
- */
-#ifdef __APPLE__
-#  define USES_APPLE_DEPRECATED_API DIAG_OFF(deprecated-declarations)
-#  define USES_APPLE_RST DIAG_ON(deprecated-declarations)
-#else
-#  define USES_APPLE_DEPRECATED_API
-#  define USES_APPLE_RST
-#endif
-
-/*
- * end of Apple deprecation workaround macros
- */
-
 /*
  * Statement attributes, for various compilers.
  *