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 /config.h.win32 | |
| 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 'config.h.win32')
| -rw-r--r-- | config.h.win32 | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/config.h.win32 b/config.h.win32 index 2db0fed132..b19b7dc7b6 100644 --- a/config.h.win32 +++ b/config.h.win32 @@ -216,9 +216,14 @@ /* Define to have ntddndis.h */ @HAVE_NTDDNDIS_H@ -/* #undef HAVE_INET_ATON_H */ +/* Define to 1 if you have the strncasecmp function. */ +/* Actually, we don't, but we have strnicmp, and #define strncasecmp to strnicmp below */ +#define HAVE_STRNCASECMP 1 + +/* Define if you have the strptime function. */ +/* #undef HAVE_STRPTIME 1 */ + #define NEED_INET_V6DEFS_H 1 -#define NEED_STRPTIME_H 1 #ifndef WIN32 #define WIN32 1 |