osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Invert NEED_INET_ATON_H to HAVE_INET_ATON_H 

Remove unused NEED_G_ASCII_STRTOULL_H

svn path=/trunk/; revision=52385
This commit is contained in:
Jörg Mayer 2013-10-05 21:56:23 +00:00
parent f303dfdd05
commit 07a5c7442f
6 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ConfigureChecks.cmake
View File

@ -21,8 +21,6 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# #
# todo: result for NEED_... is wrong (inverted)
#check system for includes #check system for includes
include(CheckIncludeFile) include(CheckIncludeFile)
check_include_file("arpa/inet.h" HAVE_ARPA_INET_H) 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("fcntl.h" HAVE_FCNTL_H)
check_include_file("getopt.h" HAVE_GETOPT_H) check_include_file("getopt.h" HAVE_GETOPT_H)
check_include_file("grp.h" HAVE_GRP_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" HAVE_INET_ATON_H)
check_include_file("inet/aton.h" NEED_INET_ATON_H)
check_include_file("inttypes.h" HAVE_INTTYPES_H) check_include_file("inttypes.h" HAVE_INTTYPES_H)
check_include_file("lauxlib.h" HAVE_LAUXLIB_H) check_include_file("lauxlib.h" HAVE_LAUXLIB_H)
check_include_file("memory.h" HAVE_MEMORY_H) check_include_file("memory.h" HAVE_MEMORY_H)

7
cmakeconfig.h.in
View File

@ -328,11 +328,8 @@
/* Note: always defines PRI[doxu]64 macros so inttypes.h becomes useless.*/ /* Note: always defines PRI[doxu]64 macros so inttypes.h becomes useless.*/
#cmakedefine INTTYPES_H_DEFINES_FORMATS 1 #cmakedefine INTTYPES_H_DEFINES_FORMATS 1
/* Define if g_ascii_strtoull.h needs to be included */ /* Define unless inet/aton.h needs to be included */
#cmakedefine NEED_G_ASCII_STRTOULL_H 1 #cmakedefine HAVE_INET_ATON_H 0
/* Define if inet/aton.h needs to be included */
#cmakedefine NEED_INET_ATON_H 1
/* Define if inet/v6defs.h needs to be included */ /* Define if inet/v6defs.h needs to be included */
#cmakedefine NEED_INET_V6DEFS_H 1 #cmakedefine NEED_INET_V6DEFS_H 1

2
config.h.win32
View File

@ -224,7 +224,7 @@
/* Define to have ntddndis.h */ /* Define to have ntddndis.h */
@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_INET_V6DEFS_H 1
#define NEED_STRPTIME_H 1 #define NEED_STRPTIME_H 1

2
configure.ac
View File

@ -2490,7 +2490,7 @@ AC_SEARCH_LIBS(inet_aton, [socket nsl], have_inet_aton=yes,
have_inet_aton=no) have_inet_aton=no)
if test "$have_inet_aton" = no; then if test "$have_inet_aton" = no; then
INET_ATON_LO="inet_aton.lo" 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 else
INET_ATON_LO="" INET_ATON_LO=""
fi fi

2
epan/addr_resolv.c
View File

@ -87,7 +87,7 @@
#include <winsock2.h> /* needed to define AF_ values on Windows */ #include <winsock2.h> /* needed to define AF_ values on Windows */
#endif #endif
#ifdef NEED_INET_ATON_H #ifndef HAVE_INET_ATON_H
# include "wsutil/inet_aton.h" # include "wsutil/inet_aton.h"
#endif #endif

2
text2pcap.c
View File

@ -149,7 +149,7 @@
#include <winsock2.h> /* needed to define AF_ values on Windows */ #include <winsock2.h> /* needed to define AF_ values on Windows */
#endif #endif
#ifdef NEED_INET_ATON_H #ifndef HAVE_INET_ATON_H
# include "wsutil/inet_aton.h" # include "wsutil/inet_aton.h"
#endif #endif