Imported Upstream version 3.1.0

[debian/amanda] / gnulib / inet_ntop.c

diff --git a/gnulib/inet_ntop.c b/gnulib/inet_ntop.c
index a49b1e39e2dfbd530d346e82d5a384234af95692..16eb109210e2e59658073c9576096eb9eb8d659a 100644 (file)
--- a/gnulib/inet_ntop.c
+++ b/gnulib/inet_ntop.c
@@ -1,10 +1,10 @@
 /* inet_ntop.c -- convert IPv4 and IPv6 addresses from binary to text form
 
-   Copyright (C) 2005, 2006  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
-   the Free Software Foundation; either version 3, or (at your option)
+   the Free Software Foundation; either version 2, or (at your option)
    any later version.
 
    This program is distributed in the hope that it will be useful,
@@ -36,7 +36,7 @@
 #include <config.h>
 
 /* Specification.  */
-#include "inet_ntop.h"
+#include <arpa/inet.h>
 
 #include <stdio.h>
 #include <string.h>
@@ -70,8 +70,8 @@ static const char *inet_ntop6 (const unsigned char *src, char *dst, socklen_t si
  *     Paul Vixie, 1996.
  */
 const char *
-inet_ntop (int af, const void *src,
-          char *dst, socklen_t cnt)
+inet_ntop (int af, const void *restrict src,
+          char *restrict dst, socklen_t cnt)
 {
   switch (af)
     {