diff options
| author | Guy Harris <guy@alum.mit.edu> | 2000-07-14 07:11:53 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2000-07-14 07:11:53 +0000 |
| commit | a1b0b42431f2072ea589305792a0b0a47e75fc23 (patch) | |
| tree | ec53f0668632038aef21ac9f30ff60714200aa0c /config.h.win32 | |
| parent | 9b652d0958e6297593c6346bfb2b75eb718e79a8 (diff) | |
| download | wireshark-a1b0b42431f2072ea589305792a0b0a47e75fc23.tar.gz wireshark-a1b0b42431f2072ea589305792a0b0a47e75fc23.tar.bz2 wireshark-a1b0b42431f2072ea589305792a0b0a47e75fc23.zip | |
Apparently, on systems with glibc 2.2, "inet_aton()" is declared in
<arpa/inet.h>, but is, in some fashion, declared differently from the
way we declare it in "inet_v6defs.h", but "inet_ntop()" isn't defined,
so we include "inet_v6defs.h" in "inet_pton.c", which causes
"inet_pton.c" not to compile as we get a collision between the two
declarations.
Move the declaration of "inet_aton()" to "inet_aton.h", define
"NEED_INET_ATON_H" iff we didn't find "inet_aton()" in the system
libraries, and include "inet_aton.h" in the callers of "inet_aton()" iff
"NEED_INET_ATON_H" is defined, so that it doesn't get declared by us if
"inet_aton()" is defined by a system library (which hopefully means it's
declared in <arpa/inet.h> instead).
svn path=/trunk/; revision=2137
Diffstat (limited to 'config.h.win32')
| -rw-r--r-- | config.h.win32 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/config.h.win32 b/config.h.win32 index 139885e392..7991afbbb4 100644 --- a/config.h.win32 +++ b/config.h.win32 @@ -1,4 +1,4 @@ -/* $Id: config.h.win32,v 1.13 2000/07/05 17:24:29 gram Exp $ */ +/* $Id: config.h.win32,v 1.14 2000/07/14 07:11:52 guy Exp $ */ /* config.h.win32 Generated manually. :-) */ /* config.h. Generated automatically by configure. */ /* config.h.in. Generated automatically from configure.in by autoheader. */ @@ -72,6 +72,7 @@ #define HAVE_WINSOCK_H 1 #define HAVE_DIRECT_H 1 #define HAVE_IO_H 1 +#define NEED_INET_ATON_H 1 #define NEED_INET_V6DEFS_H 1 #define NEED_GETOPT_H 1 #define snprintf _snprintf |