diff options
| -rw-r--r-- | ConfigureChecks.cmake | 5 | ||||
| -rw-r--r-- | cmakeconfig.h.in | 7 | ||||
| -rw-r--r-- | config.h.win32 | 2 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | epan/addr_resolv.c | 2 | ||||
| -rw-r--r-- | text2pcap.c | 2 |
6 files changed, 7 insertions, 13 deletions
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index a8d319bd75..9537a0c727 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -21,8 +21,6 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # -# todo: result for NEED_... is wrong (inverted) - #check system for includes include(CheckIncludeFile) check_include_file("arpa/inet.h" HAVE_ARPA_INET_H) @@ -33,8 +31,7 @@ check_include_file("dlfcn.h" HAVE_DLFCN_H) check_include_file("fcntl.h" HAVE_FCNTL_H) check_include_file("getopt.h" HAVE_GETOPT_H) check_include_file("grp.h" HAVE_GRP_H) -check_include_file("g_ascii_strtoull.h" NEED_G_ASCII_STRTOULL_H) -check_include_file("inet/aton.h" NEED_INET_ATON_H) +check_include_file("inet/aton.h" HAVE_INET_ATON_H) check_include_file("inttypes.h" HAVE_INTTYPES_H) check_include_file("lauxlib.h" HAVE_LAUXLIB_H) check_include_file("memory.h" HAVE_MEMORY_H) diff --git a/cmakeconfig.h.in b/cmakeconfig.h.in index 1c43c9d65c..bc4a145e89 100644 --- a/cmakeconfig.h.in +++ b/cmakeconfig.h.in @@ -328,11 +328,8 @@ /* Note: always defines PRI[doxu]64 macros so inttypes.h becomes useless.*/ #cmakedefine INTTYPES_H_DEFINES_FORMATS 1 -/* Define if g_ascii_strtoull.h needs to be included */ -#cmakedefine NEED_G_ASCII_STRTOULL_H 1 - -/* Define if inet/aton.h needs to be included */ -#cmakedefine NEED_INET_ATON_H 1 +/* Define unless inet/aton.h needs to be included */ +#cmakedefine HAVE_INET_ATON_H 0 /* Define if inet/v6defs.h needs to be included */ #cmakedefine NEED_INET_V6DEFS_H 1 diff --git a/config.h.win32 b/config.h.win32 index 8a32639559..0f596fe7ac 100644 --- a/config.h.win32 +++ b/config.h.win32 @@ -224,7 +224,7 @@ /* Define to have ntddndis.h */ @HAVE_NTDDNDIS_H@ -#define NEED_INET_ATON_H 1 +#define HAVE_INET_ATON_H 0 #define NEED_INET_V6DEFS_H 1 #define NEED_STRPTIME_H 1 diff --git a/configure.ac b/configure.ac index 864560aeca..9e32d0925b 100644 --- a/configure.ac +++ b/configure.ac @@ -2490,7 +2490,7 @@ AC_SEARCH_LIBS(inet_aton, [socket nsl], have_inet_aton=yes, have_inet_aton=no) if test "$have_inet_aton" = no; then INET_ATON_LO="inet_aton.lo" - AC_DEFINE(NEED_INET_ATON_H, 1, [Define if inet/aton.h needs to be included]) + AC_DEFINE(HAVE_INET_ATON_H, 0, [Define unless inet/aton.h needs to be included]) else INET_ATON_LO="" fi diff --git a/epan/addr_resolv.c b/epan/addr_resolv.c index e21c3f74b7..60943f66c8 100644 --- a/epan/addr_resolv.c +++ b/epan/addr_resolv.c @@ -87,7 +87,7 @@ #include <winsock2.h> /* needed to define AF_ values on Windows */ #endif -#ifdef NEED_INET_ATON_H +#ifndef HAVE_INET_ATON_H # include "wsutil/inet_aton.h" #endif diff --git a/text2pcap.c b/text2pcap.c index e9b8b1ef96..1ed8296286 100644 --- a/text2pcap.c +++ b/text2pcap.c @@ -149,7 +149,7 @@ #include <winsock2.h> /* needed to define AF_ values on Windows */ #endif -#ifdef NEED_INET_ATON_H +#ifndef HAVE_INET_ATON_H # include "wsutil/inet_aton.h" #endif |