2000-09-23 Franz Sirl <Franz.Sirl-kernel@lauterbach.com>

        * stdstreams.cc: Include <libio.h>, not "libio.h".
        * iolibio.h: Likewise.
        (_IO_pos_BAD): Use _IO_off_t instead of _IO_fpos_t.
        * libio.h (_IO_USER_LOCK): Define.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@36580 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libio/ChangeLog b/libio/ChangeLog
index dc57df0..43763a8 100644 (file)
--- a/libio/ChangeLog
+++ b/libio/ChangeLog
@@ -1,3 +1,10 @@
+2000-09-23  Franz Sirl  <Franz.Sirl-kernel@lauterbach.com>
+
+       * stdstreams.cc: Include <libio.h>, not "libio.h".
+       * iolibio.h: Likewise.
+       (_IO_pos_BAD): Use _IO_off_t instead of _IO_fpos_t.
+       * libio.h (_IO_USER_LOCK): Define.
+
 2000-08-18  Gabriel Dos Reis  <gdr@merlin.codesourcery.com>
 
        * editbuf.h (edit_streambuf): Fix syntax error in

diff --git a/libio/iolibio.h b/libio/iolibio.h
index 083b198..0ebc14f 100644 (file)
--- a/libio/iolibio.h
+++ b/libio/iolibio.h
@@ -1,4 +1,4 @@
-#include "libio.h"
+#include <libio.h>
 
 /* These emulate stdio functionality, but with a different name
    (_IO_ungetc instead of ungetc), and using _IO_FILE instead of FILE. */
@@ -38,7 +38,11 @@ extern int _IO_obstack_vprintf __P ((struct obstack *, const char *,
                                     _IO_va_list));
 extern int _IO_obstack_printf __P ((struct obstack *, const char *, ...));
 #ifndef _IO_pos_BAD
-#define _IO_pos_BAD ((_IO_fpos_t)(-1))
+# if defined(_G_IO_IO_FILE_VERSION) && _G_IO_IO_FILE_VERSION == 0x20001
+#  define _IO_pos_BAD ((_IO_off64_t) -1)
+# else
+#  define _IO_pos_BAD ((_IO_off_t) -1)
+# endif
 #endif
 #define _IO_clearerr(FP) ((FP)->_flags &= ~(_IO_ERR_SEEN|_IO_EOF_SEEN))
 #define _IO_fseek(__fp, __offset, __whence) \

diff --git a/libio/libio.h b/libio/libio.h
index b4dffa8..c453b77 100644 (file)
--- a/libio/libio.h
+++ b/libio/libio.h
@@ -136,6 +136,7 @@
 #define _IO_IS_APPENDING 0x1000
 #define _IO_IS_FILEBUF 0x2000
 #define _IO_BAD_SEEN 0x4000
+#define _IO_USER_LOCK 0x8000
 
 /* These are "formatting flags" matching the iostream fmtflags enum values. */
 #define _IO_SKIPWS 01

diff --git a/libio/stdstreams.cc b/libio/stdstreams.cc
index a5889d7..7a74eaa 100644 (file)
--- a/libio/stdstreams.cc
+++ b/libio/stdstreams.cc
@@ -36,7 +36,7 @@ the executable file might be covered by the GNU General Public License. */
 // then we don't need to, since in that case stdin/stdout/stderr
 // are identical to _IO_stdin/_IO_stdout/_IO_stderr.
 
-#include "libio.h"
+#include <libio.h>
 
 #ifdef _STDIO_USES_IOSTREAM
 #define CIN_SBUF _IO_stdin_