Mercurial > hg > octave-lojdl > gnulib-hg
changeset 13054:0b6e401a5e89
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>
| author | Eric Blake <eblake@redhat.com> |
|---|---|
| date | Wed, 24 Mar 2010 17:25:49 -0600 |
| parents | 1ea205413d02 |
| children | c7be8484e434 |
| files | ChangeLog lib/arpa_inet.in.h |
| diffstat | 2 files changed, 10 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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.
--- 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@