diff options
| author | Simon Josefsson <simon@josefsson.org> | 2006-06-19 10:47:30 +0000 |
|---|---|---|
| committer | Simon Josefsson <simon@josefsson.org> | 2006-06-19 10:47:30 +0000 |
| commit | 3f06ea00c68987ce00dd1f48e344a31102306fd1 (patch) | |
| tree | dbccaf8c8bc0b27c14f464f09e3d19151d882c59 /lib/inet_ntop.c | |
| parent | befdbf38ebf8fe8e1ba8df593aba9382b58ed125 (diff) | |
| download | gnulib-3f06ea00c68987ce00dd1f48e344a31102306fd1.tar.gz | |
2006-06-19 Simon Josefsson <jas@extundo.com>
* inet_ntop.c: Always build inet_ntop4, since inet_ntop6 calls it.
Diffstat (limited to 'lib/inet_ntop.c')
| -rw-r--r-- | lib/inet_ntop.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/lib/inet_ntop.c b/lib/inet_ntop.c index fc84fa8c14..34574be072 100644 --- 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 @@ inet_ntop (int af, const void *restrict src, { 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 @@ inet_ntop (int af, const void *restrict src, /* NOTREACHED */ } -#if HAVE_IPV4 - /* const char * * inet_ntop4(src, dst, size) * format an IPv4 address @@ -127,8 +121,6 @@ inet_ntop4 (const unsigned char *src, char *dst, socklen_t size) return strcpy (dst, tmp); } -#endif - #if HAVE_IPV6 /* const char * |