From: Bruno Haible <bruno@clisp.org>
Date: Wed, 8 Jun 2005 19:32:15 +0000 (+0000)
Subject: Avoid gcc warning on mingw.
X-Git-Tag: cvs-readonly~3270
X-Git-Url: http://erislabs.net/gitweb/?a=commitdiff_plain;h=a7742484349a1a75d6b3767e296137f2cd94558c;p=gnulib.git

Avoid gcc warning on mingw.
---

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 29cc7968b..72da16c27 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,5 +1,10 @@
 2005-06-08  Bruno Haible  <bruno@clisp.org>
 
+	* binary-io.h (fileno): Undefine before defining it. Avoids a gcc
+	warning on mingw.
+
+2005-06-08  Bruno Haible  <bruno@clisp.org>
+
 	* csharpcomp.h: New file, from GNU gettext.
 	* csharpcomp.c: New file, from GNU gettext.
 	* csharpcomp.sh.in: New file, from GNU gettext.
diff --git a/lib/binary-io.h b/lib/binary-io.h
index d9892d33b..d9748ee25 100644
--- a/lib/binary-io.h
+++ b/lib/binary-io.h
@@ -1,5 +1,5 @@
 /* Binary mode I/O.
-   Copyright (C) 2001, 2003 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2003, 2005 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
@@ -39,6 +39,7 @@
 #if O_BINARY
 # if !(defined __EMX__ || defined __DJGPP__ || defined __CYGWIN__)
 #  define setmode _setmode
+#  undef fileno
 #  define fileno _fileno
 # endif
 # if defined __DJGPP__ || defined __CYGWIN__