diff options
| author | Guy Harris <gharris@sonic.net> | 2022-03-08 15:18:24 -0800 |
|---|---|---|
| committer | Guy Harris <gharris@sonic.net> | 2022-03-08 15:18:24 -0800 |
| commit | f6fb59b11d20222d4648cdceeaadf6ce971a7a9a (patch) | |
| tree | 82d4be40231a93047587a9cd52777b77528e188d /pcap/compiler-tests.h | |
| parent | cc9e70b80e0a33130fcb24fbab13a40666976d7f (diff) | |
| parent | e75cc82c46e0f1208fbac03530da6a30976c7fd6 (diff) | |
Merge branch 'master' into pcap-options
Diffstat (limited to 'pcap/compiler-tests.h')
| -rw-r--r-- | pcap/compiler-tests.h | 50 |
1 files changed, 38 insertions, 12 deletions
diff --git a/pcap/compiler-tests.h b/pcap/compiler-tests.h index a69c2b09..2d98a707 100644 --- a/pcap/compiler-tests.h +++ b/pcap/compiler-tests.h @@ -80,9 +80,11 @@ */ #if ! defined(__GNUC__) -#define PCAP_IS_AT_LEAST_GNUC_VERSION(major, minor) 0 + /* Not GCC and not "just like GCC" */ + #define PCAP_IS_AT_LEAST_GNUC_VERSION(major, minor) 0 #else -#define PCAP_IS_AT_LEAST_GNUC_VERSION(major, minor) \ + /* GCC or "just like GCC" */ + #define PCAP_IS_AT_LEAST_GNUC_VERSION(major, minor) \ (__GNUC__ > (major) || \ (__GNUC__ == (major) && __GNUC_MINOR__ >= (minor))) #endif @@ -92,9 +94,11 @@ */ #if !defined(__clang__) -#define PCAP_IS_AT_LEAST_CLANG_VERSION(major, minor) 0 + /* Not Clang */ + #define PCAP_IS_AT_LEAST_CLANG_VERSION(major, minor) 0 #else -#define PCAP_IS_AT_LEAST_CLANG_VERSION(major, minor) \ + /* Clang */ + #define PCAP_IS_AT_LEAST_CLANG_VERSION(major, minor) \ (__clang_major__ > (major) || \ (__clang_major__ == (major) && __clang_minor__ >= (minor))) #endif @@ -118,13 +122,15 @@ */ #if ! defined(__SUNPRO_C) -#define PCAP_IS_AT_LEAST_SUNC_VERSION(major,minor) 0 + /* Not Sun/Oracle C */ + #define PCAP_IS_AT_LEAST_SUNC_VERSION(major,minor) 0 #else -#define PCAP_SUNPRO_VERSION_TO_BCD(major, minor) \ + /* Sun/Oracle C */ + #define PCAP_SUNPRO_VERSION_TO_BCD(major, minor) \ (((minor) >= 10) ? \ (((major) << 12) | (((minor)/10) << 8) | (((minor)%10) << 4)) : \ (((major) << 8) | ((minor) << 4))) -#define PCAP_IS_AT_LEAST_SUNC_VERSION(major,minor) \ + #define PCAP_IS_AT_LEAST_SUNC_VERSION(major,minor) \ (__SUNPRO_C >= PCAP_SUNPRO_VERSION_TO_BCD((major), (minor))) #endif @@ -133,13 +139,31 @@ * * The version number in __xlC__ has the major version in the * upper 8 bits and the minor version in the lower 8 bits. + * On AIX __xlC__ is always defined, __ibmxl__ becomes defined in XL C 16.1. + * On Linux since XL C 13.1.6 __xlC__ is not defined by default anymore, but + * __ibmxl__ is defined since at least XL C 13.1.1. */ -#if ! defined(__xlC__) -#define PCAP_IS_AT_LEAST_XL_C_VERSION(major,minor) 0 +#if ! defined(__xlC__) && ! defined(__ibmxl__) + /* Not XL C */ + #define PCAP_IS_AT_LEAST_XL_C_VERSION(major,minor) 0 #else -#define PCAP_IS_AT_LEAST_XL_C_VERSION(major, minor) \ + /* XL C */ + #if defined(__ibmxl__) + /* + * Later Linux version of XL C; use __ibmxl_version__ to test + * the version. + */ + #define PCAP_IS_AT_LEAST_XL_C_VERSION(major, minor) \ + (__ibmxl_version__ > (major) || \ + (__ibmxl_version__ == (major) && __ibmxl_release__ >= (minor))) + #else /* __ibmxl__ */ + /* + * __ibmxl__ not defined; use __xlC__ to test the version. + */ + #define PCAP_IS_AT_LEAST_XL_C_VERSION(major, minor) \ (__xlC__ >= (((major) << 8) | (minor))) + #endif /* __ibmxl__ */ #endif /* @@ -154,9 +178,11 @@ */ #if ! defined(__HP_aCC) -#define PCAP_IS_AT_LEAST_HP_C_VERSION(major,minor) 0 + /* Not HP C */ + #define PCAP_IS_AT_LEAST_HP_C_VERSION(major,minor) 0 #else -#define PCAP_IS_AT_LEAST_HP_C_VERSION(major,minor) \ + /* HP C */ + #define PCAP_IS_AT_LEAST_HP_C_VERSION(major,minor) \ (__HP_aCC >= ((major)*10000 + (minor)*100)) #endif |