diff options
| author | Guy Harris <guy@alum.mit.edu> | 2014-07-06 14:02:39 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2014-07-06 21:03:09 +0000 |
| commit | 5bfc21cf9e42af13a8d1ad6eb545ab82cb7dbe9d (patch) | |
| tree | 89a9afacd2d37d3eadc22165a0256a14b089da1e /text2pcap.c | |
| parent | e64942068632fc01b6a1211bfb90df8265e41fe7 (diff) | |
| download | wireshark-5bfc21cf9e42af13a8d1ad6eb545ab82cb7dbe9d.tar.gz | |
Clean up handling of missing functions.
With autotools, CMake, and nmake, if we have a function, #define
HAVE_{function_name_in_all_caps}, otherwise don't #define it.
If we provide our own version of a function in libwsutil, make sure we
have a header that declares it, and *ONLY* include that header if
HAVE_{function_name_in_all_caps} is *NOT* defined, so that we don't have
the system declaration and our declaration colliding.
Check for inet_aton, strncasecmp, and strptime with CMake, just as we do
with autotools.
Simplify the addition of {function_name_in_all_caps}_LO to libwsutil in
autotools.
Change-Id: Id5be5c73f79f81919a3a865324e400eca7b88889
Reviewed-on: https://code.wireshark.org/review/2903
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'text2pcap.c')
| -rw-r--r-- | text2pcap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/text2pcap.c b/text2pcap.c index e308ffc3ea..d5ba3e718d 100644 --- a/text2pcap.c +++ b/text2pcap.c @@ -139,7 +139,7 @@ #include "wsutil/wsgetopt.h" #endif -#ifdef NEED_STRPTIME_H +#ifndef HAVE_STRPTIME # include "wsutil/strptime.h" #endif @@ -159,7 +159,7 @@ #include <winsock2.h> /* needed to define AF_ values on Windows */ #endif -#ifndef HAVE_INET_ATON_H +#ifndef HAVE_INET_ATON # include "wsutil/inet_aton.h" #endif |