guy 2000/07/14 02:12:03 CDT
Modified files:
. Makefile.am acconfig.h config.h.win32
configure.in inet_aton.c inet_v6defs.h
resolv.c
Added files:
. inet_aton.h
Log:
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).
Revision Changes Path
1.209 +2 -1 ethereal/Makefile.am
1.16 +3 -1 ethereal/acconfig.h
1.14 +2 -1 ethereal/config.h.win32
1.95 +2 -1 ethereal/configure.in
1.3 +2 -0 ethereal/inet_aton.c
1.3 +3 -6 ethereal/inet_v6defs.h
1.24 +5 -1 ethereal/resolv.c