From: Bruno Haible <bruno@clisp.org>
Date: Sun, 13 Apr 2008 10:50:49 +0000 (+0200)
Subject: Avoid warning on emx+gcc.
X-Git-Tag: v0.1~7565
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=8b61f0d60a6958a34fa727f97ae70b13fb758d61;p=gnulib.git

Avoid warning on emx+gcc.
---

diff --git a/ChangeLog b/ChangeLog
index a851e7c73..a3f115976 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2008-04-12  Bruno Haible  <bruno@clisp.org>
 
+	* lib/binary-io.h [__EMX__]: Include <io.h>.
+
+2008-04-12  Bruno Haible  <bruno@clisp.org>
+
 	* lib/fpucw.h: Enable the definitions also for x86_64.
 	Needed for NetBSD/x86_64.
 	Reported by Thomas Klausner <tk@giga.or.at>.
diff --git a/lib/binary-io.h b/lib/binary-io.h
index 273d35a9a..9bfddf19b 100644
--- a/lib/binary-io.h
+++ b/lib/binary-io.h
@@ -1,5 +1,5 @@
 /* Binary mode I/O.
-   Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2003, 2005, 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
@@ -36,14 +36,13 @@
 # undef O_TEXT
 #endif
 #if O_BINARY
-# if !(defined __EMX__ || defined __DJGPP__ || defined __CYGWIN__)
+# if defined __EMX__ || defined __DJGPP__ || defined __CYGWIN__
+#  include <io.h> /* declares setmode() */
+# else
 #  define setmode _setmode
 #  undef fileno
 #  define fileno _fileno
 # endif
-# if defined __DJGPP__ || defined __CYGWIN__
-#  include <io.h> /* declares setmode() */
-# endif
 # ifdef __DJGPP__
 #  include <unistd.h> /* declares isatty() */
 #  /* Avoid putting stdin/stdout in binary mode if it is connected to the