Merge branch 'master' of ssh://haible@git.sv.gnu.org/srv/git/gnulib

[gnulib.git] / lib / inet_pton.h

diff --git a/lib/inet_pton.h b/lib/inet_pton.h
index bc2ee91..3335cb8 100644 (file)
--- a/lib/inet_pton.h
+++ b/lib/inet_pton.h
@@ -1,10 +1,10 @@
 /* Convert internet address from text to binary format.
    Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   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
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,17 +12,12 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <sys/types.h>
 #include <sys/socket.h>
-#if HAVE_NETINET_IN_H
-# include <netinet/in.h>
-#endif
-#if HAVE_ARPA_INET_H
-# include <arpa/inet.h>
-#endif
+#include <netinet/in.h>
+#include <arpa/inet.h>
 
 #if !HAVE_DECL_INET_PTON
 extern int inet_pton (int af, const char *restrict src, void *restrict dst);