Mercurial > hg > octave-nkf > gnulib-hg
changeset 6838:5eb20b30a115
2006-06-19 Simon Josefsson <jas@extundo.com>
* inet_ntop.c: Always build inet_ntop4, since inet_ntop6 calls it.
| author | Simon Josefsson <simon@josefsson.org> |
|---|---|
| date | Mon, 19 Jun 2006 10:47:30 +0000 |
| parents | 02c971653322 |
| children | f46c3b1bd633 |
| files | lib/ChangeLog lib/inet_ntop.c |
| diffstat | 2 files changed, 5 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,7 @@ +2006-06-19 Simon Josefsson <jas@extundo.com> + + * inet_ntop.c: Always build inet_ntop4, since inet_ntop6 calls it. + 2006-06-19 Paul Eggert <eggert@cs.ucla.edu> * alloca_.h (alloca) [defined alloca]: Don't define or declare.
--- a/lib/inet_ntop.c +++ b/lib/inet_ntop.c @@ -1,5 +1,5 @@ /* inet_ntop.c -- convert IPv4 and IPv6 addresses from binary to text form - Copyright (c) 2005 Free Software Foundation, Inc. + Copyright (c) 2005, 2006 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -56,9 +56,7 @@ */ typedef int verify_int_size[2 * sizeof (int) - 7]; -#if HAVE_IPV4 static const char *inet_ntop4 (const unsigned char *src, char *dst, socklen_t size); -#endif #if HAVE_IPV6 static const char *inet_ntop6 (const unsigned char *src, char *dst, socklen_t size); #endif @@ -78,10 +76,8 @@ { switch (af) { -#if HAVE_IPV4 case AF_INET: return (inet_ntop4 (src, dst, cnt)); -#endif #if HAVE_IPV6 case AF_INET6: @@ -95,8 +91,6 @@ /* NOTREACHED */ } -#if HAVE_IPV4 - /* const char * * inet_ntop4(src, dst, size) * format an IPv4 address @@ -127,8 +121,6 @@ return strcpy (dst, tmp); } -#endif - #if HAVE_IPV6 /* const char *