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 /epan | |
| parent | e64942068632fc01b6a1211bfb90df8265e41fe7 (diff) | |
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 'epan')
| -rw-r--r-- | epan/addr_resolv.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-dcom.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-lbmr.c | 4 | ||||
| -rw-r--r-- | epan/dissectors/packet-lbtrm.c | 4 | ||||
| -rw-r--r-- | epan/ftypes/ftype-time.c | 2 | ||||
| -rw-r--r-- | epan/tvbuff.c | 2 |
6 files changed, 11 insertions, 5 deletions
diff --git a/epan/addr_resolv.c b/epan/addr_resolv.c index fbfc7295de..7e1420976c 100644 --- a/epan/addr_resolv.c +++ b/epan/addr_resolv.c @@ -85,7 +85,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 diff --git a/epan/dissectors/packet-dcom.c b/epan/dissectors/packet-dcom.c index d26b407f96..c185ce4d0d 100644 --- a/epan/dissectors/packet-dcom.c +++ b/epan/dissectors/packet-dcom.c @@ -81,7 +81,9 @@ #include <epan/exceptions.h> #include <epan/wmem/wmem.h> #include <epan/addr_resolv.h> +#ifndef HAVE_INET_ATON #include <wsutil/inet_aton.h> +#endif #include <epan/expert.h> #include <epan/prefs.h> #include <ctype.h> diff --git a/epan/dissectors/packet-lbmr.c b/epan/dissectors/packet-lbmr.c index f891bcc236..8e95b68bc9 100644 --- a/epan/dissectors/packet-lbmr.c +++ b/epan/dissectors/packet-lbmr.c @@ -41,7 +41,9 @@ #include <epan/value_string.h> #include <epan/wmem/wmem.h> #include <epan/to_str.h> -#include <wsutil/inet_aton.h> +#ifndef HAVE_INET_ATON + #include <wsutil/inet_aton.h> +#endif #include <wsutil/pint.h> #include "packet-lbm.h" #include "packet-lbtru.h" diff --git a/epan/dissectors/packet-lbtrm.c b/epan/dissectors/packet-lbtrm.c index 4fa8b42820..c7165aa59f 100644 --- a/epan/dissectors/packet-lbtrm.c +++ b/epan/dissectors/packet-lbtrm.c @@ -38,7 +38,9 @@ #include <epan/tap.h> #include <epan/conversation.h> #include <epan/to_str.h> -#include <wsutil/inet_aton.h> +#ifndef HAVE_INET_ATON + #include <wsutil/inet_aton.h> +#endif #include <wsutil/pint.h> #include "packet-lbm.h" #include "packet-lbtrm.h" diff --git a/epan/ftypes/ftype-time.c b/epan/ftypes/ftype-time.c index 8b3471956f..1bbf793169 100644 --- a/epan/ftypes/ftype-time.c +++ b/epan/ftypes/ftype-time.c @@ -39,7 +39,7 @@ #include <ftypes-int.h> #include <epan/to_str.h> -#ifdef NEED_STRPTIME_H +#ifndef HAVE_STRPTIME #include "wsutil/strptime.h" #endif diff --git a/epan/tvbuff.c b/epan/tvbuff.c index 1ad77b7cf9..11fe105cdf 100644 --- a/epan/tvbuff.c +++ b/epan/tvbuff.c @@ -59,7 +59,7 @@ * yet defined. */ #include <time.h> -/*#ifdef NEED_STRPTIME_H*/ +/*#ifndef HAVE_STRPTIME*/ #ifndef strptime #include "wsutil/strptime.h" #endif |