X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Finet_pton.c;h=62ef145950544800c84e1bf468997a07ada12404;hb=5709a7204dfd9a4fedf2cdbaa341bc6c540dadf3;hp=f2b58bb633a9bc0d9c52389c9d066c68dd6ecf1e;hpb=cf357e415055e3979d0f0d72b3046022f4bb7812;p=gnulib.git

diff --git a/lib/inet_pton.c b/lib/inet_pton.c
index f2b58bb63..62ef14595 100644
--- a/lib/inet_pton.c
+++ b/lib/inet_pton.c
@@ -1,10 +1,11 @@
 /* inet_pton.c -- convert IPv4 and IPv6 addresses from text to binary form
-   Copyright (c) 2006  Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   Copyright (C) 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
-   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,8 +13,7 @@
    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/>.  */
 
 /*
  * Copyright (c) 1996,1999 by Internet Software Consortium.
@@ -32,14 +32,12 @@
  * SOFTWARE.
  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Specification.  */
-#include "inet_pton.h"
+#include <arpa/inet.h>
 
-#include <ctype.h>
+#include <c-ctype.h>
 #include <string.h>
 #include <errno.h>
 
@@ -80,7 +78,7 @@ inet_pton (int af, const char *restrict src, void *restrict dst)
     case AF_INET:
       return (inet_pton4 (src, dst));
 
-#if HAVE_IPV4
+#if HAVE_IPV6
     case AF_INET6:
       return (inet_pton6 (src, dst));
 #endif
@@ -181,7 +179,7 @@ inet_pton6 (const char *restrict src, unsigned char *restrict dst)
   curtok = src;
   saw_xdigit = 0;
   val = 0;
-  while ((ch = tolower (*src++)) != '\0')
+  while ((ch = c_tolower (*src++)) != '\0')
     {
       const char *pch;