X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Finet_ntop.h;h=bd1e085aed9418ee354ae9c8d649b3ead3d0044c;hb=471815b5cfb17e9a6b4ea985cc18edb87e26f30f;hp=661dca641c350ec2e0e1dc44c1a4ee858772b509;hpb=cb1feaf3cc5a6e8e25b0aab6d28a71c26e380a19;p=gnulib.git

diff --git a/lib/inet_ntop.h b/lib/inet_ntop.h
index 661dca641..bd1e085ae 100644
--- a/lib/inet_ntop.h
+++ b/lib/inet_ntop.h
@@ -1,5 +1,5 @@
 /* Convert internet address from internal to printable, presentable format.
-   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
@@ -16,12 +16,9 @@
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #include <sys/types.h>
-#ifdef HAVE_SYS_SOCKET_H
-# include <sys/socket.h>
-#endif
-#ifdef HAVE_ARPA_INET_H
-# include <arpa/inet.h>
-#endif
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
 
 /* Converts an internet address from internal format to a printable,
    presentable format.
@@ -39,7 +36,7 @@
    For more details, see the POSIX:2001 specification
    <http://www.opengroup.org/susv3xsh/inet_ntop.html>.  */
 
-#ifndef HAVE_DECL_INET_NTOP
+#if !HAVE_DECL_INET_NTOP
 extern const char *inet_ntop (int af, const void *restrict src,
 			      char *restrict dst, socklen_t cnt);
 #endif