oops, references to the server /var/log/amanda directory in rules, too

[debian/amanda] / gnulib / arpa_inet.in.h

diff --git a/gnulib/arpa_inet.in.h b/gnulib/arpa_inet.in.h
index 315d9661f3bddc7ea211900ba6fced2442e791f3..f7c3bc728abb02406065dffb0de1111ed7ca180b 100644 (file)
--- a/gnulib/arpa_inet.in.h
+++ b/gnulib/arpa_inet.in.h
@@ -1,10 +1,10 @@
 /* A GNU-like <arpa/inet.h>.
 
 /* A GNU-like <arpa/inet.h>.
 

-   Copyright (C) 2005-2006, 2008 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2008-2010 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
 
    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)
+   the Free Software Foundation; either version 3, or (at your option)

    any later version.
 
    This program is distributed in the hope that it will be useful,
    any later version.
 
    This program is distributed in the hope that it will be useful,


@@ -18,16 +18,19 @@
 
 #ifndef _GL_ARPA_INET_H
 
 
 #ifndef _GL_ARPA_INET_H
 

+#if __GNUC__ >= 3
+@PRAGMA_SYSTEM_HEADER@
+#endif
+

 /* Gnulib's sys/socket.h is responsible for pulling in winsock2.h etc
 /* Gnulib's sys/socket.h is responsible for pulling in winsock2.h etc

-   under MinGW. */
-#include <sys/socket.h>
+   under MinGW.
+   But avoid namespace pollution on glibc systems.  */
+#ifndef __GLIBC__
+# include <sys/socket.h>
+#endif

 
 #if @HAVE_ARPA_INET_H@
 
 
 #if @HAVE_ARPA_INET_H@
 

-# if __GNUC__ >= 3
-@PRAGMA_SYSTEM_HEADER@
-# endif
-

 /* The include_next requires a split double-inclusion guard.  */
 # @INCLUDE_NEXT@ @NEXT_ARPA_INET_H@
 
 /* The include_next requires a split double-inclusion guard.  */
 # @INCLUDE_NEXT@ @NEXT_ARPA_INET_H@
 


@@ -36,7 +39,9 @@
 #ifndef _GL_ARPA_INET_H
 #define _GL_ARPA_INET_H
 
 #ifndef _GL_ARPA_INET_H
 #define _GL_ARPA_INET_H
 

-/* The definition of GL_LINK_WARNING is copied here.  */
+/* The definition of _GL_ARG_NONNULL is copied here.  */
+
+/* The definition of _GL_WARN_ON_USE is copied here.  */

 
 #ifdef __cplusplus
 extern "C" {
 
 #ifdef __cplusplus
 extern "C" {


@@ -60,26 +65,28 @@ extern "C" {
    For more details, see the POSIX:2001 specification
    <http://www.opengroup.org/susv3xsh/inet_ntop.html>.  */
 extern const char *inet_ntop (int af, const void *restrict src,
    For more details, see the POSIX:2001 specification
    <http://www.opengroup.org/susv3xsh/inet_ntop.html>.  */
 extern const char *inet_ntop (int af, const void *restrict src,

-                             char *restrict dst, socklen_t cnt);
+                              char *restrict dst, socklen_t cnt)
+     _GL_ARG_NONNULL ((2, 3));

 # endif
 #elif defined GNULIB_POSIXCHECK
 # undef inet_ntop
 # endif
 #elif defined GNULIB_POSIXCHECK
 # undef inet_ntop

-# define inet_ntop(af,src,dst,cnt) \
-    (GL_LINK_WARNING ("inet_ntop is unportable - " \
-                      "use gnulib module inet_ntop for portability"), \
-     inet_ntop (af, src, dst, cnt))
+# if HAVE_RAW_DECL_INET_NTOP
+_GL_WARN_ON_USE (inet_ntop, "inet_ntop is unportable - "
+                 "use gnulib module inet_ntop for portability");
+# endif

 #endif
 
 #if @GNULIB_INET_PTON@
 # if !@HAVE_DECL_INET_PTON@
 #endif
 
 #if @GNULIB_INET_PTON@
 # if !@HAVE_DECL_INET_PTON@

-extern int inet_pton (int af, const char *restrict src, void *restrict dst);
+extern int inet_pton (int af, const char *restrict src, void *restrict dst)
+     _GL_ARG_NONNULL ((2, 3));

 # endif
 #elif defined GNULIB_POSIXCHECK
 # undef inet_pton
 # endif
 #elif defined GNULIB_POSIXCHECK
 # undef inet_pton

-# define inet_pton(af,src,dst) \
-  (GL_LINK_WARNING ("inet_pton is unportable - " \
-                   "use gnulib module inet_pton for portability"), \
-   inet_pton (af, src, dst))
+# if HAVE_RAW_DECL_INET_PTON
+_GL_WARN_ON_USE (inet_pton, "inet_pton is unportable - "
+                 "use gnulib module inet_pton for portability");
+# endif

 #endif
 
 #ifdef __cplusplus
 #endif
 
 #ifdef __cplusplus