Skip to content

Commit

Permalink
Clean up the stuff we do to get <inttypes.h> stuff defined.
Browse files Browse the repository at this point in the history
If we have a libpcap with <pcap/pcap-inttypes.h>, include it, so that we
don't have to worry about definitions colliding if we later include a
pcap header file that includes pcap/pcap-inttypes.h.

Otherwise, do the same stuff pcap-inttypes.h does.  This means that, on
UN*X, we require that there be an <inttypes.h> that defines everything
we need.

Don't bother doing checks that are no longer necessary as a result of
those changes.
  • Loading branch information
guyharris committed Sep 15, 2017
1 parent cd246d1 commit 14c81f0
Show file tree
Hide file tree
Showing 4 changed files with 143 additions and 777 deletions.
62 changes: 3 additions & 59 deletions config.h.in
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,9 @@
/* Define to 1 if you have the <pcap/nflog.h> header file. */
#undef HAVE_PCAP_NFLOG_H

/* Define to 1 if you have the <pcap/pcap-inttypes.h> header file. */
#undef HAVE_PCAP_PCAP_INTTYPES_H

/* Define to 1 if you have the `pcap_setdirection' function. */
#undef HAVE_PCAP_SETDIRECTION

Expand Down Expand Up @@ -277,18 +280,6 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION

/* define if the platform doesn't define PRId64 */
#undef PRId64

/* define if the platform doesn't define PRIo64 */
#undef PRIo64

/* define if the platform doesn't define PRIx64 */
#undef PRIu64

/* define if the platform doesn't define PRIu64 */
#undef PRIx64

/* Define as the return type of signal handlers (`int' or `void'). */
#undef RETSIGTYPE

Expand Down Expand Up @@ -319,21 +310,6 @@
/* 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 were 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 were 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 were allowed, the
#define below would cause a syntax error. */
#undef _UINT8_T

/* define if your compiler allows __attribute__((fallthrough)) without a
warning */
#undef __ATTRIBUTE___FALLTHROUGH_OK
Expand All @@ -344,22 +320,6 @@
/* Define as token for inline if inlining supported */
#undef inline

/* 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 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 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 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 `uint16_t' if u_int16_t not defined. */
#undef u_int16_t

Expand All @@ -372,22 +332,6 @@
/* Define to `uint8_t' 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

/* Define to the type of an unsigned integer type wide enough to hold a
pointer, if such a type exists, and if the system does not define it. */
#undef uintptr_t
Loading

0 comments on commit 14c81f0

Please sign in to comment.