projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Take into account the number of pushed-back bytes (ungetc).
[gnulib.git]
/
lib
/
binary-io.h
diff --git
a/lib/binary-io.h
b/lib/binary-io.h
index
ed74c06
..
273d35a
100644
(file)
--- a/
lib/binary-io.h
+++ b/
lib/binary-io.h
@@
-1,10
+1,10
@@
/* Binary mode I/O.
/* 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
+ 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
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
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-12,15
+12,19
@@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#ifndef _BINARY_H
#define _BINARY_H
#ifndef _BINARY_H
#define _BINARY_H
-#include <fcntl.h>
/* For systems that distinguish between text and binary I/O.
O_BINARY is usually declared in <fcntl.h>. */
/* For systems that distinguish between text and binary I/O.
O_BINARY is usually declared in <fcntl.h>. */
+#include <fcntl.h>
+
+/* The MSVC7 <stdio.h> doesn't like to be included after '#define fileno ...',
+ so we include it here first. */
+#include <stdio.h>
+
#if !defined O_BINARY && defined _O_BINARY
/* For MSC-compatible compilers. */
# define O_BINARY _O_BINARY
#if !defined O_BINARY && defined _O_BINARY
/* For MSC-compatible compilers. */
# define O_BINARY _O_BINARY
@@
-32,12
+36,15
@@
# undef O_TEXT
#endif
#if O_BINARY
# undef O_TEXT
#endif
#if O_BINARY
-# if !(defined __EMX__ || defined __DJGPP__)
+# if !(defined __EMX__ || defined __DJGPP__
|| defined __CYGWIN__
)
# define setmode _setmode
# define setmode _setmode
+# undef fileno
# define fileno _fileno
# endif
# define fileno _fileno
# endif
-# if
def __DJGPP
__
+# if
defined __DJGPP__ || defined __CYGWIN
__
# include <io.h> /* declares setmode() */
# 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
# console, because that would make it impossible for the user to
# include <unistd.h> /* 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
@@
-48,6
+55,7
@@
# endif
#else
/* On reasonable systems, binary I/O is the default. */
# endif
#else
/* On reasonable systems, binary I/O is the default. */
+# undef O_BINARY
# define O_BINARY 0
# define SET_BINARY(fd) /* nothing */
#endif
# define O_BINARY 0
# define SET_BINARY(fd) /* nothing */
#endif