X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Finet_ntop.c;h=16eb109210e2e59658073c9576096eb9eb8d659a;hb=217969cf220de4c0515eccd614de1640c3f46bcf;hp=fc84fa8c14378b43b3c6c518acc92d262875ccd3;hpb=cb1feaf3cc5a6e8e25b0aab6d28a71c26e380a19;p=gnulib.git

diff --git a/lib/inet_ntop.c b/lib/inet_ntop.c
index fc84fa8c1..16eb10921 100644
--- a/lib/inet_ntop.c
+++ b/lib/inet_ntop.c
@@ -1,5 +1,6 @@
 /* inet_ntop.c -- convert IPv4 and IPv6 addresses from binary to text form
-   Copyright (c) 2005  Free Software Foundation, Inc.
+
+   Copyright (C) 2005, 2006, 2008  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
@@ -32,12 +33,10 @@
  * SOFTWARE.
  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Specification.  */
-#include "inet_ntop.h"
+#include <arpa/inet.h>
 
 #include <stdio.h>
 #include <string.h>
@@ -56,9 +55,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
@@ -95,8 +92,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 +122,6 @@ inet_ntop4 (const unsigned char *src, char *dst, socklen_t size)
   return strcpy (dst, tmp);
 }
 
-#endif
-
 #if HAVE_IPV6
 
 /* const char *