1 diff -urN gcc-2.95.2.org/libio/iolibio.h gcc-2.95.2/libio/iolibio.h
2 --- gcc-2.95.2.org/libio/iolibio.h Mon Oct 30 18:04:49 2000
3 +++ gcc-2.95.2/libio/iolibio.h Mon Oct 30 18:09:42 2000
8 /* These emulate stdio functionality, but with a different name
9 (_IO_ungetc instead of ungetc), and using _IO_FILE instead of FILE. */
12 extern int _IO_obstack_printf __P ((struct obstack *, const char *, ...));
14 -#define _IO_pos_BAD ((_IO_fpos_t)(-1))
15 +# if defined(_G_IO_IO_FILE_VERSION) && _G_IO_IO_FILE_VERSION == 0x20001
16 +# define _IO_pos_BAD ((_IO_off64_t) -1)
18 +# define _IO_pos_BAD ((_IO_off_t) -1)
21 #define _IO_clearerr(FP) ((FP)->_flags &= ~(_IO_ERR_SEEN|_IO_EOF_SEEN))
22 #define _IO_fseek(__fp, __offset, __whence) \
23 diff -urN gcc-2.95.2.org/libio/iostream.cc gcc-2.95.2/libio/iostream.cc
24 --- gcc-2.95.2.org/libio/iostream.cc Mon Oct 30 18:04:49 2000
25 +++ gcc-2.95.2/libio/iostream.cc Mon Oct 30 18:13:18 2000
27 /* This is part of libio/iostream, providing -*- C++ -*- input/output.
28 - Copyright (C) 1993, 1997 Free Software Foundation, Inc.
29 + Copyright (C) 1993, 1997, 2000 Free Software Foundation, Inc.
31 This file is part of the GNU IO Library. This library is free
32 software; you can redistribute it and/or modify it under the
35 #if __GLIBC_MINOR__ >= 1
37 +#if __GLIBC_MINOR__ >= 2
46 #if __GLIBC_MINOR__ >= 1
48 +#if __GLIBC_MINOR__ >= 2
55 diff -urN gcc-2.95.2.org/libio/libio.h gcc-2.95.2/libio/libio.h
56 --- gcc-2.95.2.org/libio/libio.h Mon Oct 30 18:04:49 2000
57 +++ gcc-2.95.2/libio/libio.h Mon Oct 30 18:10:14 2000
59 #define _IO_IS_APPENDING 0x1000
60 #define _IO_IS_FILEBUF 0x2000
61 #define _IO_BAD_SEEN 0x4000
62 +#define _IO_USER_LOCK 0x8000
64 /* These are "formatting flags" matching the iostream fmtflags enum values. */
68 _IO_ssize_t (*read) __PMT ((struct _IO_FILE *, void *, _IO_ssize_t));
69 _IO_ssize_t (*write) __PMT ((struct _IO_FILE *, const void *, _IO_ssize_t));
70 - _IO_fpos_t (*seek) __PMT ((struct _IO_FILE *, _IO_off_t, int));
71 + _IO_off_t (*seek) __PMT ((struct _IO_FILE *, _IO_off_t, int));
72 int (*close) __PMT ((struct _IO_FILE *));
73 } _IO_cookie_io_functions_t;
76 extern _IO_size_t _IO_sgetn __P ((_IO_FILE *, void *, _IO_size_t));
78 #if defined(_G_IO_IO_FILE_VERSION) && _G_IO_IO_FILE_VERSION == 0x20001
79 -extern _IO_fpos64_t _IO_seekoff __P ((_IO_FILE *, _IO_off64_t, int, int));
80 -extern _IO_fpos64_t _IO_seekpos __P ((_IO_FILE *, _IO_fpos64_t, int));
81 +extern _IO_off64_t _IO_seekoff __P ((_IO_FILE *, _IO_off64_t, int, int));
82 +extern _IO_off64_t _IO_seekpos __P ((_IO_FILE *, _IO_off64_t, int));
84 -extern _IO_fpos_t _IO_seekoff __P ((_IO_FILE *, _IO_off_t, int, int));
85 -extern _IO_fpos_t _IO_seekpos __P ((_IO_FILE *, _IO_fpos_t, int));
86 +extern _IO_off_t _IO_seekoff __P ((_IO_FILE *, _IO_off_t, int, int));
87 +extern _IO_off_t _IO_seekpos __P ((_IO_FILE *, _IO_off_t, int));
90 extern void _IO_free_backup_area __P ((_IO_FILE *));
91 diff -urN gcc-2.95.2.org/libio/libioP.h gcc-2.95.2/libio/libioP.h
92 --- gcc-2.95.2.org/libio/libioP.h Mon Oct 30 18:04:49 2000
93 +++ gcc-2.95.2/libio/libioP.h Mon Oct 30 18:25:49 2000
95 It matches the streambuf::seekoff virtual function.
96 It is also used for the ANSI fseek function. */
97 #if defined(_G_IO_IO_FILE_VERSION) && _G_IO_IO_FILE_VERSION == 0x20001
98 -typedef _IO_fpos64_t (*_IO_seekoff_t) __PMT ((_IO_FILE *FP, _IO_off64_t OFF,
99 +typedef _IO_off64_t (*_IO_seekoff_t) __PMT ((_IO_FILE *FP, _IO_off64_t OFF,
102 -typedef _IO_fpos_t (*_IO_seekoff_t) __PMT ((_IO_FILE *FP, _IO_off_t OFF,
103 +typedef _IO_off_t (*_IO_seekoff_t) __PMT ((_IO_FILE *FP, _IO_off_t OFF,
106 #define _IO_SEEKOFF(FP, OFF, DIR, MODE) JUMP3 (__seekoff, FP, OFF, DIR, MODE)
108 It is also used for the ANSI fgetpos and fsetpos functions. */
109 /* The _IO_seek_cur and _IO_seek_end options are not allowed. */
110 #if defined(_G_IO_IO_FILE_VERSION) && _G_IO_IO_FILE_VERSION == 0x20001
111 -typedef _IO_fpos64_t (*_IO_seekpos_t) __PMT ((_IO_FILE *, _IO_fpos64_t, int));
112 +typedef _IO_off64_t (*_IO_seekpos_t) __PMT ((_IO_FILE *, _IO_off64_t, int));
114 -typedef _IO_fpos_t (*_IO_seekpos_t) __PMT ((_IO_FILE *, _IO_fpos_t, int));
115 +typedef _IO_off_t (*_IO_seekpos_t) __PMT ((_IO_FILE *, _IO_off_t, int));
117 #define _IO_SEEKPOS(FP, POS, FLAGS) JUMP2 (__seekpos, FP, POS, FLAGS)
120 It matches the streambuf::sys_seek virtual function, which is
121 specific to this implementation. */
122 #if defined(_G_IO_IO_FILE_VERSION) && _G_IO_IO_FILE_VERSION == 0x20001
123 -typedef _IO_fpos64_t (*_IO_seek_t) __PMT ((_IO_FILE *, _IO_off64_t, int));
124 +typedef _IO_off64_t (*_IO_seek_t) __PMT ((_IO_FILE *, _IO_off64_t, int));
126 -typedef _IO_fpos_t (*_IO_seek_t) __PMT ((_IO_FILE *, _IO_off_t, int));
127 +typedef _IO_off_t (*_IO_seek_t) __PMT ((_IO_FILE *, _IO_off_t, int));
129 #define _IO_SYSSEEK(FP, OFFSET, MODE) JUMP2 (__seek, FP, OFFSET, MODE)
131 @@ -298,11 +298,11 @@
132 /* Generic functions */
134 #if defined(_G_IO_IO_FILE_VERSION) && _G_IO_IO_FILE_VERSION == 0x20001
135 -extern _IO_fpos64_t _IO_seekoff __P ((_IO_FILE *, _IO_off64_t, int, int));
136 -extern _IO_fpos64_t _IO_seekpos __P ((_IO_FILE *, _IO_fpos64_t, int));
137 +extern _IO_off64_t _IO_seekoff __P ((_IO_FILE *, _IO_off64_t, int, int));
138 +extern _IO_off64_t _IO_seekpos __P ((_IO_FILE *, _IO_off64_t, int));
140 -extern _IO_fpos_t _IO_seekoff __P ((_IO_FILE *, _IO_off_t, int, int));
141 -extern _IO_fpos_t _IO_seekpos __P ((_IO_FILE *, _IO_fpos_t, int));
142 +extern _IO_off_t _IO_seekoff __P ((_IO_FILE *, _IO_off_t, int, int));
143 +extern _IO_off_t _IO_seekpos __P ((_IO_FILE *, _IO_off_t, int));
146 extern void _IO_switch_to_main_get_area __P ((_IO_FILE *));
147 @@ -340,22 +340,22 @@
149 extern _IO_size_t _IO_default_xsgetn __P ((_IO_FILE *, void *, _IO_size_t));
150 #if defined(_G_IO_IO_FILE_VERSION) && _G_IO_IO_FILE_VERSION == 0x20001
151 -extern _IO_fpos64_t _IO_default_seekoff __P ((_IO_FILE *,
152 +extern _IO_off64_t _IO_default_seekoff __P ((_IO_FILE *,
153 _IO_off64_t, int, int));
154 -extern _IO_fpos64_t _IO_default_seekpos __P ((_IO_FILE *,
155 - _IO_fpos64_t, int));
156 +extern _IO_off64_t _IO_default_seekpos __P ((_IO_FILE *,
157 + _IO_off64_t, int));
159 -extern _IO_fpos_t _IO_default_seekoff __P ((_IO_FILE *, _IO_off_t, int, int));
160 -extern _IO_fpos_t _IO_default_seekpos __P ((_IO_FILE *, _IO_fpos_t, int));
161 +extern _IO_off_t _IO_default_seekoff __P ((_IO_FILE *, _IO_off_t, int, int));
162 +extern _IO_off_t _IO_default_seekpos __P ((_IO_FILE *, _IO_off_t, int));
164 extern _IO_ssize_t _IO_default_write __P ((_IO_FILE *, const void *,
166 extern _IO_ssize_t _IO_default_read __P ((_IO_FILE *, void *, _IO_ssize_t));
167 extern int _IO_default_stat __P ((_IO_FILE *, void *));
168 #if defined(_G_IO_IO_FILE_VERSION) && _G_IO_IO_FILE_VERSION == 0x20001
169 -extern _IO_fpos64_t _IO_default_seek __P ((_IO_FILE *, _IO_off64_t, int));
170 +extern _IO_off64_t _IO_default_seek __P ((_IO_FILE *, _IO_off64_t, int));
172 -extern _IO_fpos_t _IO_default_seek __P ((_IO_FILE *, _IO_off_t, int));
173 +extern _IO_off_t _IO_default_seek __P ((_IO_FILE *, _IO_off_t, int));
175 extern int _IO_default_sync __P ((_IO_FILE *));
176 #define _IO_default_close ((_IO_close_t) _IO_default_sync)
177 @@ -389,11 +389,11 @@
178 extern int _IO_file_doallocate __P ((_IO_FILE *));
179 extern _IO_FILE* _IO_file_setbuf __P ((_IO_FILE *, char *, _IO_ssize_t));
180 #if defined(_G_IO_IO_FILE_VERSION) && _G_IO_IO_FILE_VERSION == 0x20001
181 -extern _IO_fpos64_t _IO_file_seekoff __P ((_IO_FILE *, _IO_off64_t, int, int));
182 -extern _IO_fpos64_t _IO_file_seek __P ((_IO_FILE *, _IO_off64_t, int));
183 +extern _IO_off64_t _IO_file_seekoff __P ((_IO_FILE *, _IO_off64_t, int, int));
184 +extern _IO_off64_t _IO_file_seek __P ((_IO_FILE *, _IO_off64_t, int));
186 -extern _IO_fpos_t _IO_file_seekoff __P ((_IO_FILE *, _IO_off_t, int, int));
187 -extern _IO_fpos_t _IO_file_seek __P ((_IO_FILE *, _IO_off_t, int));
188 +extern _IO_off_t _IO_file_seekoff __P ((_IO_FILE *, _IO_off_t, int, int));
189 +extern _IO_off_t _IO_file_seek __P ((_IO_FILE *, _IO_off_t, int));
191 extern _IO_size_t _IO_file_xsputn __P ((_IO_FILE *, const void *, _IO_size_t));
192 extern int _IO_file_stat __P ((_IO_FILE *, void *));
194 extern int _IO_str_overflow __P ((_IO_FILE *, int));
195 extern int _IO_str_pbackfail __P ((_IO_FILE *, int));
196 #if defined(_G_IO_IO_FILE_VERSION) && _G_IO_IO_FILE_VERSION == 0x20001
197 -extern _IO_fpos64_t _IO_str_seekoff __P ((_IO_FILE *, _IO_off64_t, int, int));
198 +extern _IO_off64_t _IO_str_seekoff __P ((_IO_FILE *, _IO_off64_t, int, int));
200 -extern _IO_fpos_t _IO_str_seekoff __P ((_IO_FILE *, _IO_off_t, int, int));
201 +extern _IO_off_t _IO_str_seekoff __P ((_IO_FILE *, _IO_off_t, int, int));
203 extern void _IO_str_finish __P ((_IO_FILE *, int));
205 @@ -544,12 +544,12 @@
206 where an _IO_fpos_t is a struct.
207 Note that _IO_off_t must be an integral type. */
209 -/* _IO_pos_BAD is an _IO_fpos_t value indicating error, unknown, or EOF. */
210 +/* _IO_pos_BAD is an _IO_off_t value indicating error, unknown, or EOF. */
212 # if defined(_G_IO_IO_FILE_VERSION) && _G_IO_IO_FILE_VERSION == 0x20001
213 -# define _IO_pos_BAD ((_IO_fpos64_t) -1)
214 +# define _IO_pos_BAD ((_IO_off64_t) -1)
216 -# define _IO_pos_BAD ((_IO_fpos_t) -1)
217 +# define _IO_pos_BAD ((_IO_off_t) -1)
220 /* _IO_pos_as_off converts an _IO_fpos_t value to an _IO_off_t value. */
222 /* _IO_pos_0 is an _IO_fpos_t value indicating beginning of file. */
224 # if defined(_G_IO_IO_FILE_VERSION) && _G_IO_IO_FILE_VERSION == 0x20001
225 -# define _IO_pos_0 ((_IO_fpos64_t) 0)
226 +# define _IO_pos_0 ((_IO_off64_t) 0)
228 -# define _IO_pos_0 ((_IO_fpos_t) 0)
229 +# define _IO_pos_0 ((_IO_off_t) 0)
233 diff -urN gcc-2.95.2.org/libio/parsestream.h gcc-2.95.2/libio/parsestream.h
234 --- gcc-2.95.2.org/libio/parsestream.h Mon Oct 30 18:04:49 2000
235 +++ gcc-2.95.2/libio/parsestream.h Mon Oct 30 18:10:34 2000
238 class parsebuf : public streambuf {
240 - _IO_fpos_t pos_at_line_start;
241 + _IO_off_t pos_at_line_start;
243 unsigned long __line_number;
245 diff -urN gcc-2.95.2.org/libio/stdstreams.cc gcc-2.95.2/libio/stdstreams.cc
246 --- gcc-2.95.2.org/libio/stdstreams.cc Mon Oct 30 18:04:49 2000
247 +++ gcc-2.95.2/libio/stdstreams.cc Mon Oct 30 18:10:01 2000
249 // then we don't need to, since in that case stdin/stdout/stderr
250 // are identical to _IO_stdin/_IO_stdout/_IO_stderr.
255 #ifdef _STDIO_USES_IOSTREAM
256 #define CIN_SBUF _IO_stdin_
257 diff -urN gcc-2.95.2.org/libio/streambuf.h gcc-2.95.2/libio/streambuf.h
258 --- gcc-2.95.2.org/libio/streambuf.h Mon Oct 30 18:04:49 2000
259 +++ gcc-2.95.2/libio/streambuf.h Mon Oct 30 18:10:29 2000
262 #if defined(_G_IO_IO_FILE_VERSION) && _G_IO_IO_FILE_VERSION == 0x20001
263 typedef _IO_off64_t streamoff;
264 -typedef _IO_fpos64_t streampos;
265 +typedef _IO_off64_t streampos;
267 typedef _IO_off_t streamoff;
268 -typedef _IO_fpos_t streampos;
269 +typedef _IO_off_t streampos;
271 typedef _IO_ssize_t streamsize;