CI: Add warning exemptions for Sun C (suncc-5.15) on Solaris 10

[tcpdump] / netdissect-stdinc.h

diff --git a/netdissect-stdinc.h b/netdissect-stdinc.h
index 8f1e5727642d04687887f0a9fe2fc86ae3a14bb3..15c3e284b82239c19174f8da98f6400e3c26491c 100644 (file)
--- a/netdissect-stdinc.h
+++ b/netdissect-stdinc.h
@@ -39,12 +39,32 @@
 #ifndef netdissect_stdinc_h
 #define netdissect_stdinc_h
 
 #ifndef netdissect_stdinc_h
 #define netdissect_stdinc_h
 

+#include "ftmacros.h"
+

 #include <errno.h>
 
 #include "compiler-tests.h"
 
 #include "varattrs.h"
 
 #include <errno.h>
 
 #include "compiler-tests.h"
 
 #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
+ * sufficient C99 support there.
+ */
+#if defined(_MSC_VER)
+  /*
+   * Make sure we have VS 2015 or later.
+   */
+  #if _MSC_VER < 1900
+    #error "Building tcpdump requires VS 2015 or later"
+  #endif
+#endif
+

 /*
  * Get the C99 types, and the PRI[doux]64 format strings, defined.
  */
 /*
  * Get the C99 types, and the PRI[doux]64 format strings, defined.
  */


@@ -63,97 +83,37 @@
    * worry about other headers including it and causing
    * clashes.
    */
    * worry about other headers including it and causing
    * clashes.
    */

-  #if defined(_MSC_VER)
-    /*
-     * Compiler is MSVC.
-     */
-    #if _MSC_VER >= 1800
-      /*
-       * VS 2013 or newer; we have <inttypes.h>.
-       */
-      #include <inttypes.h>
-    #else
-      /*
-       * Earlier VS; we have to define this stuff ourselves.
-       */
-      typedef unsigned char uint8_t;
-      typedef signed char int8_t;
-      typedef unsigned short uint16_t;
-      typedef signed short int16_t;
-      typedef unsigned int uint32_t;
-      typedef signed int int32_t;
-      #ifdef _MSC_EXTENSIONS
-        typedef unsigned _int64 uint64_t;
-        typedef _int64 int64_t;
-      #else /* _MSC_EXTENSIONS */
-        typedef unsigned long long uint64_t;
-        typedef long long int64_t;
-      #endif
-
-      /*
-       * We have _strtoi64().  Use that for strtoint64_t().
-       */
-      #define strtoint64_t     _strtoi64
-    #endif

 
 

+  /*
+   * 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.
+   *
+   * If the compiler is MinGW, we assume we have <inttypes.h> - and
+   * support for %zu in the formatted printing functions.
+   *
+   * If the target is UN*X, we assume we have a C99-or-later development
+   * environment, and thus have <inttypes.h> - and support for %zu in
+   * the formatted printing functions.
+   *
+   * If the target is MS-DOS, we assume we have <inttypes.h> - and support
+   * for %zu in the formatted printing functions.
+   */
+  #include <inttypes.h>
+
+  #if defined(_MSC_VER)

     /*
      * Suppress definition of intN_t in bittypes.h, which might be included
      * by <pcap/pcap.h> in older versions of WinPcap.
     /*
      * Suppress definition of intN_t in bittypes.h, which might be included
      * by <pcap/pcap.h> in older versions of WinPcap.

-     * (Yes, HAVE_U_INTn_T, as the definition guards are UN*X-oriented, and
-     * we check for u_intN_t in the UN*X configure script.)
+     * (Yes, HAVE_U_INTn_T, as the definition guards are UN*X-oriented.)

      */
     #define HAVE_U_INT8_T
     #define HAVE_U_INT16_T
     #define HAVE_U_INT32_T
     #define HAVE_U_INT64_T
      */
     #define HAVE_U_INT8_T
     #define HAVE_U_INT16_T
     #define HAVE_U_INT32_T
     #define HAVE_U_INT64_T

-
-    /*
-     * These may be defined by <inttypes.h>.  If not, define them
-     * ourselves.
-     *
-     * XXX - for MSVC, we always want the _MSC_EXTENSIONS versions.
-     * What about other compilers?  If, as the MinGW Web site says MinGW
-     * does, the other compilers just use Microsoft's run-time library,
-     * then they should probably use the _MSC_EXTENSIONS even if the
-     * compiler doesn't define _MSC_EXTENSIONS.
-     */
-    #ifndef PRId64
-      #ifdef _MSC_EXTENSIONS
-        #define PRId64 "I64d"
-      #else
-        #define PRId64 "lld"
-      #endif
-    #endif /* PRId64 */
-
-    #ifndef PRIo64
-      #ifdef _MSC_EXTENSIONS
-        #define PRIo64 "I64o"
-      #else
-        #define PRIo64 "llo"
-      #endif
-    #endif /* PRIo64 */
-
-    #ifndef PRIx64
-      #ifdef _MSC_EXTENSIONS
-        #define PRIx64 "I64x"
-      #else
-        #define PRIx64 "llx"
-      #endif
-    #endif
-
-    #ifndef PRIu64
-      #ifdef _MSC_EXTENSIONS
-        #define PRIu64 "I64u"
-      #else
-        #define PRIu64 "llu"
-      #endif
-    #endif
-  #elif defined(__MINGW32__) || !defined(_WIN32)
-    /*
-     * Compiler is MinGW or target is UN*X or MS-DOS.  Just use
-     * <inttypes.h>.
-     */
-    #include <inttypes.h>

   #endif
 #endif /* HAVE_PCAP_PCAP_INTTYPES_H */
 
   #endif
 #endif /* HAVE_PCAP_PCAP_INTTYPES_H */
 


@@ -166,7 +126,6 @@
 #include <stdio.h>
 #include <winsock2.h>
 #include <ws2tcpip.h>
 #include <stdio.h>
 #include <winsock2.h>
 #include <ws2tcpip.h>

-#include <ctype.h>

 #include <time.h>
 #include <io.h>
 #include <fcntl.h>
 #include <time.h>
 #include <io.h>
 #include <fcntl.h>


@@ -175,25 +134,11 @@
 #ifdef _MSC_VER
   /*
    * Compiler is MSVC.
 #ifdef _MSC_VER
   /*
    * Compiler is MSVC.

+   *
+   * We require VS 2015 or newer, so we have strtoll().  Use that for
+   * strtoint64_t().

    */
    */

-  #if _MSC_VER >= 1800
-    /*
-     * VS 2013 or newer; we have strtoll().  Use that for strtoint64_t().
-     */
-    #define strtoint64_t       strtoll
-  #else
-    /*
-     * Earlier VS; we don't have strtoll(), but we do have
-     * _strtoi64().  Use that for strtoint64_t().
-     */
-    #define strtoint64_t       _strtoi64
-  #endif
-
-  /*
-   * Microsoft's documentation doesn't speak of LL as a valid
-   * suffix for 64-bit integers, so we'll just use i64.
-   */
-  #define INT64_T_CONSTANT(constant)   (constant##i64)
+  #define strtoint64_t strtoll

 #else
   /*
    * Non-Microsoft compiler.
 #else
   /*
    * Non-Microsoft compiler.


@@ -201,11 +146,6 @@
    * XXX - should we use strtoll or should we use _strtoi64()?
    */
   #define strtoint64_t         strtoll
    * XXX - should we use strtoll or should we use _strtoi64()?
    */
   #define strtoint64_t         strtoll

-
-  /*
-   * Assume LL works.
-   */
-  #define INT64_T_CONSTANT(constant)   (constant##LL)

 #endif
 
 #ifdef _MSC_VER
 #endif
 
 #ifdef _MSC_VER


@@ -214,16 +154,20 @@
    * by adding a preceding underscore; we *want* the UN*Xisms, so add
    * #defines to let us use them.
    */
    * 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 isatty _isatty
   #define stat _stat

-  #define strdup _strdup

   #define open _open
   #define open _open

-  #define fstat _fstat

   #define read _read
   #define close _close
   #define O_RDONLY _O_RDONLY
 
   #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
   /*
    * If <crtdbg.h> has been included, and _DEBUG is defined, and
    * __STDC__ is zero, <crtdbg.h> will define strdup() to call


@@ -233,6 +177,11 @@
   #ifndef strdup
     #define strdup _strdup
   #endif
   #ifndef strdup
     #define strdup _strdup
   #endif

+
+  /*
+   * Windows doesn't have ssize_t; routines such as _read() return int.
+   */
+  typedef int ssize_t;

 #endif  /* _MSC_VER */
 
 /*
 #endif  /* _MSC_VER */
 
 /*


@@ -242,10 +191,6 @@
 #define inline __inline
 #endif
 
 #define inline __inline
 #endif
 

-#if defined(AF_INET6) && !defined(HAVE_OS_IPV6_SUPPORT)
-#define HAVE_OS_IPV6_SUPPORT
-#endif
-

 #ifndef INET6_ADDRSTRLEN
 #define INET6_ADDRSTRLEN 46
 #endif
 #ifndef INET6_ADDRSTRLEN
 #define INET6_ADDRSTRLEN 46
 #endif


@@ -257,7 +202,7 @@
 #endif
 
 #ifndef caddr_t
 #endif
 
 #ifndef caddr_t

-typedef char* caddr_t;
+typedef char *caddr_t;

 #endif /* caddr_t */
 
 #define MAXHOSTNAMELEN 64
 #endif /* caddr_t */
 
 #define MAXHOSTNAMELEN 64


@@ -268,7 +213,6 @@ typedef char* caddr_t;
  * Includes and definitions for various flavors of UN*X.
  */
 
  * Includes and definitions for various flavors of UN*X.
  */
 

-#include <ctype.h>

 #include <unistd.h>
 #include <netdb.h>
 #include <sys/param.h>
 #include <unistd.h>
 #include <netdb.h>
 #include <sys/param.h>


@@ -282,15 +226,16 @@ typedef char* caddr_t;
 #include <arpa/inet.h>
 
 /*
 #include <arpa/inet.h>
 
 /*

- * Assume all UN*Xes have strtoll(), and use it for strtoint64_t().
+ * 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 strtoint64_t   strtoll
+#define our_fstat fstat
+#define our_statb struct stat

 
 /*
 
 /*

- * Assume LL works.
+ * Assume all UN*Xes have strtoll(), and use it for strtoint64_t().

  */
  */

-#define INT64_T_CONSTANT(constant)     (constant##LL)
-
+#define strtoint64_t   strtoll

 #endif /* _WIN32 */
 
 /*
 #endif /* _WIN32 */
 
 /*


@@ -298,62 +243,6 @@ typedef char* caddr_t;
  */
 #include "funcattrs.h"
 
  */
 #include "funcattrs.h"
 

-/*
- * On Windows, snprintf(), with that name and with C99 behavior - i.e.,
- * guaranteeing that the formatted string is null-terminated - didn't
- * appear until Visual Studio 2015.  Prior to that, the C runtime had
- * only _snprintf(), which *doesn't* guarantee that the string is
- * null-terminated if it is truncated due to the buffer being too
- * small.  We therefore can't just define snprintf to be _snprintf
- * and define vsnprintf to be _vsnprintf, as we're relying on null-
- * termination of strings in all cases.
- *
- * Furthermore, some versions of Visual Studio prior to Visual
- * Studio 2015 had vsnprintf() (but not snprintf()!), but those
- * versions don't guarantee null termination, either.
- *
- * We assume all UN*Xes that have snprintf() and vsnprintf() provide
- * C99 behavior.
- */
-#if defined(_MSC_VER) || defined(__MINGW32__)
-  #if defined(_MSC_VER) && _MSC_VER >= 1900
-    /*
-     * VS 2015 or newer; just use the C runtime's snprintf() and
-     * vsnprintf().
-     */
-    #define nd_snprintf                snprintf
-    #define nd_vsnprintf       vsnprintf
-  #else /* defined(_MSC_VER) && _MSC_VER >= 1900 */
-    /*
-     * VS prior to 2015, or MingGW; assume we have _snprintf_s() and
-     * _vsnprintf_s(), which guarantee null termination.
-     */
-    #define nd_snprintf(buf, buflen, ...) \
-        _snprintf_s(buf, buflen, _TRUNCATE, __VA_ARGS__)
-    #define nd_vsnprintf(buf, buflen, fmt, ap) \
-        _vsnprintf_s(buf, buflen, _TRUNCATE, fmt, ap)
-  #endif /* defined(_MSC_VER) && _MSC_VER >= 1900 */
-#else /* defined(_MSC_VER) || defined(__MINGW32__) */
-  /*
-   * Some other compiler, which we assume to be a UN*X compiler.
-   * Use the system's snprintf() if we have it, otherwise use
-   * our own implementation
-   */
-  #ifdef HAVE_SNPRINTF
-    #define nd_snprintf                snprintf
-  #else /* HAVE_SNPRINTF */
-    int nd_snprintf (char *str, size_t sz, FORMAT_STRING(const char *format), ...)
-        PRINTFLIKE(3, 4);
-  #endif /* HAVE_SNPRINTF */
-
-  #ifdef HAVE_VSNPRINTF
-    #define nd_vsnprintf       vsnprintf
-  #else /* HAVE_VSNPRINTF */
-    int nd_vsnprintf (char *str, size_t sz, FORMAT_STRING(const char *format),
-        va_list ap) PRINTFLIKE(3, 0);
-  #endif /* HAVE_VSNPRINTF */
-#endif /* defined(_MSC_VER) || defined(__MINGW32__) */
-

 /*
  * fopen() read and write modes for text files and binary files.
  */
 /*
  * fopen() read and write modes for text files and binary files.
  */


@@ -410,28 +299,6 @@ typedef char* caddr_t;
   }
 #endif
 
   }
 #endif
 

-/*
- * If the OS doesn't define AF_INET6 and struct in6_addr:
- *
- * define AF_INET6, so we can use it internally as a "this is an
- * IPv6 address" indication;
- *
- * define struct in6_addr so that we can use it for IPv6 addresses.
- */
-#ifndef HAVE_OS_IPV6_SUPPORT
-#ifndef AF_INET6
-#define AF_INET6       24
-
-struct in6_addr {
-       union {
-               __uint8_t   __u6_addr8[16];
-               __uint16_t  __u6_addr16[8];
-               __uint32_t  __u6_addr32[4];
-       } __u6_addr;                    /* 128-bit IP6 address */
-};
-#endif
-#endif
-

 #ifndef NI_MAXHOST
 #define        NI_MAXHOST      1025
 #endif
 #ifndef NI_MAXHOST
 #define        NI_MAXHOST      1025
 #endif


@@ -448,70 +315,6 @@ struct in6_addr {
 #define FALSE 0
 #endif
 
 #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.
  *
 /*
  * Statement attributes, for various compilers.
  *