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

1 files changed, 3 insertions, 6 deletions

diff --git a/inet_v6defs.h b/inet_v6defs.h
index 91e86ad8c4..2c686ca346 100644
--- a/inet_v6defs.h
+++ b/inet_v6defs.h
@@ -1,6 +1,6 @@
-/* inet_pton.h
+/* inet_v6defs.h
  *
- * $Id: inet_v6defs.h,v 1.2 2000/01/10 17:32:51 gram Exp $
+ * $Id: inet_v6defs.h,v 1.3 2000/07/14 07:11:53 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -22,16 +22,13 @@
  */
 
 /*
- * Version of "inet_pton()" and "inet_ntop()", for the benefit of OSes that
+ * Versions of "inet_pton()" and "inet_ntop()", for the benefit of OSes that
  * don't have it.
  */
 extern int inet_pton(int af, const char *src, void *dst);
 extern const char *inet_ntop(int af, const void *src, char *dst,
     size_t size);
 
-struct in_addr;
-extern int inet_aton(const char* cp_arg, struct in_addr *addr);
-
 /*
  * Those OSes may also not have AF_INET6, so declare it here if it's not
  * already declared, so that we can pass it to "inet_ntop()" and "inet_pton()".