diff options
| author | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2000-07-14 07:11:53 +0000 |
|---|---|---|
| committer | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2000-07-14 07:11:53 +0000 |
| commit | a4588afe1378b01f063cf480b7a30ba572d8d071 (patch) | |
| tree | ec53f0668632038aef21ac9f30ff60714200aa0c /acconfig.h | |
| parent | c2a6f7c44bd0f6f71a180be9ddb451502806c86a (diff) | |
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).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@2137 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'acconfig.h')
| -rw-r--r-- | acconfig.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/acconfig.h b/acconfig.h index 32b4ecc721..d33adb88c3 100644 --- a/acconfig.h +++ b/acconfig.h @@ -1,7 +1,7 @@ /* acconfig.h * #ifdefs to be controlled by "configure" * - * $Id: acconfig.h,v 1.15 2000/01/15 10:25:41 guy Exp $ + * $Id: acconfig.h,v 1.16 2000/07/14 07:11:52 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -31,6 +31,8 @@ #undef DATAFILE_DIR +#undef NEED_INET_ATON_H + #undef NEED_INET_V6DEFS_H #undef NEED_SNPRINTF_H |