From: Eric Blake Date: Wed, 24 Mar 2010 23:25:49 +0000 (-0600) Subject: arpa/inet: fix mingw compilation warning X-Git-Tag: v0.1~4433 X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=1f87c50a60309f7ae9aafbc7d614f2760f7ded99;p=gnulib.git arpa/inet: fix mingw compilation warning Mingw doesn't have , so a conditional use of the pragma was never encountered, and led to mingw's gcc issuing warnings about duplicate declarations under -Wredundant-decls. Making the #pragma unconditional (as was already done in at least fcntl.in.h) shuts up gcc. * lib/arpa_inet.in.h (system_header): Hoist to be unconditional. Reported by Matthew Bolte. Signed-off-by: Eric Blake --- diff --git a/ChangeLog b/ChangeLog index 3384fb7d2..d1e075f05 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-03-25 Eric Blake + + arpa/inet: fix mingw compilation warning + * lib/arpa_inet.in.h (system_header): Hoist to be unconditional. + Reported by Matthew Bolte. + 2010-03-25 Bruno Haible Avoid collision between gnulib wrapper and libintl wrapper. diff --git a/lib/arpa_inet.in.h b/lib/arpa_inet.in.h index a1206918c..c1d088b8b 100644 --- a/lib/arpa_inet.in.h +++ b/lib/arpa_inet.in.h @@ -16,6 +16,10 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +# if __GNUC__ >= 3 +@PRAGMA_SYSTEM_HEADER@ +# endif + #ifndef _GL_ARPA_INET_H /* Gnulib's sys/socket.h is responsible for pulling in winsock2.h etc @@ -27,10 +31,6 @@ #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@