autoupdate

[gnulib.git] / lib / inet_ntop.c

diff --git a/lib/inet_ntop.c b/lib/inet_ntop.c
index fc84fa8..033847a 100644 (file)
--- 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, 2009  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,21 +33,15 @@
  * 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>
 #include <errno.h>
 
-#ifndef EAFNOSUPPORT
-# define EAFNOSUPPORT EINVAL
-#endif
-
 #define NS_IN6ADDRSZ 16
 #define NS_INT16SZ 2
 
@@ -56,9 +51,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 +88,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 +118,6 @@ inet_ntop4 (const unsigned char *src, char *dst, socklen_t size)
   return strcpy (dst, tmp);
 }
 
-#endif
-
 #if HAVE_IPV6
 
 /* const char *