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/dissectors/packet-lbmr.c | |
| 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/dissectors/packet-lbmr.c')
| -rw-r--r-- | epan/dissectors/packet-lbmr.c | 4 |
1 files changed, 3 insertions, 1 deletions
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" |