diff options
author | Guy Harris <guy@alum.mit.edu> | 2013-06-23 14:03:38 -0700 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2013-06-23 14:03:38 -0700 |
commit | a6c16ed8abc9d0a126a18a39279a9e7b3bde0ef3 (patch) | |
tree | 2875f8e3c6e11a1497fdbbced679fe8b62a19bc9 /config.h.in | |
parent | 49a0a0d6da051df8a3cd4dfadad5dad82f3c65a5 (diff) | |
download | tcpdump-a6c16ed8abc9d0a126a18a39279a9e7b3bde0ef3.tar.gz |
Fix build issues with the OpenFlow printer on some systems.
Don't assume we have <stdint.h>. Instead, use the AC_TYPE_ macros to
ensure we have the C99 intN_t and uintN_t types; we already include
<inttypes.h> in tcpdump-stdinc.h iff we have it.
Get rid of the structure declarations in openflow-1.0.h, as they have
zero-length arrays (not supported by all the compilers people might be
using) and as
1) they're only used in sizeof()
and
2) after each one there's an assertion to check that sizeof()
returns a specific numerical value
so, instead, just #define various _LEN items to those numerical values
and use them.
Add an openflow.h header with a #define for the length of the basic
header, and move the declaration of of10_header_body_print() there.
Diffstat (limited to 'config.h.in')
-rw-r--r-- | config.h.in | 43 |
1 files changed, 39 insertions, 4 deletions
diff --git a/config.h.in b/config.h.in index 3a2da984..6eba6072 100644 --- a/config.h.in +++ b/config.h.in @@ -283,6 +283,21 @@ /* define on AIX to get certain functions */ #undef _SUN +/* Define for Solaris 2.5.1 so the uint32_t typedef from <sys/synch.h>, + <pthread.h>, or <semaphore.h> is not used. If the typedef was allowed, the + #define below would cause a syntax error. */ +#undef _UINT32_T + +/* Define for Solaris 2.5.1 so the uint64_t typedef from <sys/synch.h>, + <pthread.h>, or <semaphore.h> is not used. If the typedef was allowed, the + #define below would cause a syntax error. */ +#undef _UINT64_T + +/* Define for Solaris 2.5.1 so the uint8_t typedef from <sys/synch.h>, + <pthread.h>, or <semaphore.h> is not used. If the typedef was allowed, the + #define below would cause a syntax error. */ +#undef _UINT8_T + /* define if your compiler allows __attribute__((format)) without a warning */ #undef __ATTRIBUTE___FORMAT_OK @@ -300,16 +315,20 @@ /* Define as token for inline if inlining supported */ #undef inline -/* Define to `short' if int16_t not defined. */ +/* Define to the type of a signed integer type of width exactly 16 bits if + such a type exists and the standard includes do not define it. */ #undef int16_t -/* Define to `int' if int32_t not defined. */ +/* Define to the type of a signed integer type of width exactly 32 bits if + such a type exists and the standard includes do not define it. */ #undef int32_t -/* Define to `long long' if int64_t not defined. */ +/* Define to the type of a signed integer type of width exactly 64 bits if + such a type exists and the standard includes do not define it. */ #undef int64_t -/* Define to `signed char' if int8_t not defined. */ +/* Define to the type of a signed integer type of width exactly 8 bits if such + a type exists and the standard includes do not define it. */ #undef int8_t /* Define to `unsigned short' if u_int16_t not defined. */ @@ -323,3 +342,19 @@ /* Define to `unsigned char' if u_int8_t not defined. */ #undef u_int8_t + +/* Define to the type of an unsigned integer type of width exactly 16 bits if + such a type exists and the standard includes do not define it. */ +#undef uint16_t + +/* Define to the type of an unsigned integer type of width exactly 32 bits if + such a type exists and the standard includes do not define it. */ +#undef uint32_t + +/* Define to the type of an unsigned integer type of width exactly 64 bits if + such a type exists and the standard includes do not define it. */ +#undef uint64_t + +/* Define to the type of an unsigned integer type of width exactly 8 bits if + such a type exists and the standard includes do not define it. */ +#undef uint8_t |