diff options
| author | Simon Josefsson <simon@josefsson.org> | 2008-04-30 10:01:36 +0200 |
|---|---|---|
| committer | Simon Josefsson <simon@josefsson.org> | 2008-04-30 10:01:36 +0200 |
| commit | d3e1cc67b4a55df350346b7b9cb103e515e0425d (patch) | |
| tree | f5fe8a4d1fccba27ca2b51e9e39aa9408b200ff3 /gl/arpa_inet.in.h | |
| parent | 1d5cf5a4f19ab9bd70ef5fece695540b6be5d2c4 (diff) | |
| download | gnutls-d3e1cc67b4a55df350346b7b9cb103e515e0425d.tar.gz | |
Update gnulib files.
Diffstat (limited to 'gl/arpa_inet.in.h')
| -rw-r--r-- | gl/arpa_inet.in.h | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/gl/arpa_inet.in.h b/gl/arpa_inet.in.h index 89af96e50f..81650dacfa 100644 --- a/gl/arpa_inet.in.h +++ b/gl/arpa_inet.in.h @@ -1,5 +1,6 @@ -/* Provide a arpa/inet header file for systems lacking it (read: MinGW) - Copyright (C) 2008 Free Software Foundation, Inc. +/* A GNU-like <arpa/inet.h>. + + 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 @@ -16,12 +17,21 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #ifndef _GL_ARPA_INET_H -#define _GL_ARPA_INET_H /* Gnulib's sys/socket.h is responsible for pulling in winsock2.h etc under MinGW. */ #include <sys/socket.h> +#if @HAVE_ARPA_INET_H@ + +/* The include_next requires a split double-inclusion guard. */ +# @INCLUDE_NEXT@ @NEXT_ARPA_INET_H@ + +#endif + +#ifndef _GL_ARPA_INET_H +#define _GL_ARPA_INET_H + #if @GNULIB_INET_NTOP@ # if !@HAVE_DECL_INET_NTOP@ /* Converts an internet address from internal format to a printable, @@ -44,8 +54,8 @@ extern const char *inet_ntop (int af, const void *restrict src, # endif #elif defined GNULIB_POSIXCHECK # undef inet_ntop -# define inet_ntop(af,src,dst,cnt) \ - (GL_LINK_WARNING ("inet_ntop doesn't exist on mingw - " \ +# 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)) #endif @@ -56,10 +66,11 @@ extern int inet_pton (int af, const char *restrict src, void *restrict dst); # endif #elif defined GNULIB_POSIXCHECK # undef inet_pton -# define inet_pton(af,src,dst) \ - (GL_LINK_WARNING ("inet_pton doesn't exist on mingw - " \ - "use gnulib module inet_pton for portability"), \ +# 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)) #endif #endif /* _GL_ARPA_INET_H */ +#endif /* _GL_ARPA_INET_H */ |