X-Git-Url: https://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fbinary-io.h;h=824ad5b78a4dfaa4579c75ceaff219b091b42f4a;hb=6417476607d4f04b1a7abf97fbfbb6bd2709e724;hp=d9748ee25245a9098ddfce02e390ace4b2500f56;hpb=a7742484349a1a75d6b3767e296137f2cd94558c;p=gnulib.git
diff --git a/lib/binary-io.h b/lib/binary-io.h
index d9748ee25..824ad5b78 100644
--- a/lib/binary-io.h
+++ b/lib/binary-io.h
@@ -1,10 +1,10 @@
/* Binary mode I/O.
- Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
+ Copyright (C) 2001, 2003, 2005, 2008-2012 Free Software Foundation, Inc.
- This program is free software; you can redistribute it and/or modify
+ 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
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,53 +12,41 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+ along with this program. If not, see . */
#ifndef _BINARY_H
#define _BINARY_H
/* For systems that distinguish between text and binary I/O.
- O_BINARY is usually declared in . */
+ O_BINARY is guaranteed by the gnulib . */
#include
/* The MSVC7 doesn't like to be included after '#define fileno ...',
so we include it here first. */
#include
-#if !defined O_BINARY && defined _O_BINARY
- /* For MSC-compatible compilers. */
-# define O_BINARY _O_BINARY
-# define O_TEXT _O_TEXT
-#endif
-#ifdef __BEOS__
- /* BeOS 5 has O_BINARY and O_TEXT, but they have no effect. */
-# undef O_BINARY
-# undef O_TEXT
-#endif
+/* SET_BINARY (fd);
+ changes the file descriptor fd to perform binary I/O. */
#if O_BINARY
-# if !(defined __EMX__ || defined __DJGPP__ || defined __CYGWIN__)
+# if defined __EMX__ || defined __DJGPP__ || defined __CYGWIN__
+# include /* declares setmode() */
+# else
# define setmode _setmode
# undef fileno
# define fileno _fileno
# endif
-# if defined __DJGPP__ || defined __CYGWIN__
-# include /* declares setmode() */
-# endif
# ifdef __DJGPP__
# include /* declares isatty() */
-# /* Avoid putting stdin/stdout in binary mode if it is connected to the
-# console, because that would make it impossible for the user to
-# interrupt the program through Ctrl-C or Ctrl-Break. */
-# define SET_BINARY(fd) (!isatty (fd) ? (setmode (fd, O_BINARY), 0) : 0)
+ /* Avoid putting stdin/stdout in binary mode if it is connected to
+ the console, because that would make it impossible for the user
+ to interrupt the program through Ctrl-C or Ctrl-Break. */
+# define SET_BINARY(fd) ((void) (!isatty (fd) ? (setmode (fd, O_BINARY), 0) : 0))
# else
-# define SET_BINARY(fd) setmode (fd, O_BINARY)
+# define SET_BINARY(fd) ((void) setmode (fd, O_BINARY))
# endif
#else
/* On reasonable systems, binary I/O is the default. */
-# undef O_BINARY
-# define O_BINARY 0
-# define SET_BINARY(fd) /* nothing */
+# define SET_BINARY(fd) /* do nothing */ ((void) 0)
#endif
#endif /* _BINARY_H */