changeset 29596:bfa5b7af0a35

Avoid warning on emx+gcc.
author Bruno Haible <bruno@clisp.org>
date Sun, 13 Apr 2008 12:50:49 +0200
parents 675dc080aa4c
children 6cd3226e5d1d
files ChangeLog lib/binary-io.h
diffstat 2 files changed, 8 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sun Apr 13 02:26:28 2008 +0200
+++ b/ChangeLog	Sun Apr 13 12:50:49 2008 +0200
@@ -1,3 +1,7 @@
+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.
--- a/lib/binary-io.h	Sun Apr 13 02:26:28 2008 +0200
+++ b/lib/binary-io.h	Sun Apr 13 12:50:49 2008 +0200
@@ -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