aboutsummaryrefslogtreecommitdiffstats
path: root/epan/tvbuff.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2014-07-06 14:02:39 -0700
committerGuy Harris <guy@alum.mit.edu>2014-07-06 21:03:09 +0000
commit5bfc21cf9e42af13a8d1ad6eb545ab82cb7dbe9d (patch)
tree89a9afacd2d37d3eadc22165a0256a14b089da1e /epan/tvbuff.c
parente64942068632fc01b6a1211bfb90df8265e41fe7 (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/tvbuff.c')
-rw-r--r--epan/tvbuff.c2
1 files changed, 1 insertions, 1 deletions
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