arpa/inet: fix mingw compilation warning

Mingw doesn't have <arpa/inet.h>, 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 <eblake@redhat.com>

diff --git a/ChangeLog b/ChangeLog
index 3384fb7d219fdae50fd9f1d9a9ad5deed1a6ed6a..d1e075f05c0b4bdcdc29dc18bc2d2dde778f6a3e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-03-25  Eric Blake  <eblake@redhat.com>
+
+       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  <bruno@clisp.org>
 
        Avoid collision between gnulib wrapper and libintl wrapper.

diff --git a/lib/arpa_inet.in.h b/lib/arpa_inet.in.h
index a1206918c08713e848e0119a0737411eb4c7e012..c1d088b8bc240aba47596ae28d2b16e6b2f15d9f 100644 (file)
--- 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@