From: Ulrich Drepper <drepper@redhat.com>
Date: Wed, 21 Jul 2004 16:28:40 +0000 (+0000)
Subject: Change inet_aton type from in_addr_t to int.
X-Git-Tag: cvs/fedora-base~298
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4cdc0a3d636921357ff1ccfe02f88b9d4e974b4f;p=thirdparty%2Fglibc.git

Change inet_aton type from in_addr_t to int.
---

diff --git a/include/arpa/inet.h b/include/arpa/inet.h
index c81f5824f14..4e2c62390b4 100644
--- a/include/arpa/inet.h
+++ b/include/arpa/inet.h
@@ -1,6 +1,6 @@
 #include <inet/arpa/inet.h>
 
-extern in_addr_t __inet_aton (__const char *__cp, struct in_addr *__inp);
+extern int __inet_aton (__const char *__cp, struct in_addr *__inp);
 libc_hidden_proto (__inet_aton)
 
 libc_hidden_proto (inet_aton)
diff --git a/inet/arpa/inet.h b/inet/arpa/inet.h
index 30af9757dc2..5b1154e6f81 100644
--- a/inet/arpa/inet.h
+++ b/inet/arpa/inet.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997, 1999, 2000, 2001 Free Software Foundation, Inc.
+/* Copyright (C) 1997, 1999, 2000, 2001, 2004 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -71,7 +71,7 @@ extern __const char *inet_ntop (int __af, __const void *__restrict __cp,
 #ifdef __USE_MISC
 /* Convert Internet host address from numbers-and-dots notation in CP
    into binary data and store the result in the structure INP.  */
-extern in_addr_t inet_aton (__const char *__cp, struct in_addr *__inp) __THROW;
+extern int inet_aton (__const char *__cp, struct in_addr *__inp) __THROW;
 
 /* Format a network number NET into presentation format and place result
    in buffer starting at BUF with length of LEN bytes.  */
diff --git a/resolv/inet_addr.c b/resolv/inet_addr.c
index b52e4043d58..144b87a74c1 100644
--- a/resolv/inet_addr.c
+++ b/resolv/inet_addr.c
@@ -105,7 +105,7 @@ inet_addr(const char *cp) {
  * This replaces inet_addr, the return value from which
  * cannot distinguish between failure and a local broadcast address.
  */
-in_addr_t
+int
 __inet_aton(const char *cp, struct in_addr *addr)
 {
 	static const in_addr_t max[4] = { 0xffffffff, 0xffffff, 0xffff, 0xff };