]> git.pld-linux.org Git - packages/gcc.git/blame - gcc-glibc-2.2.patch
projects / packages / gcc.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
2.95.3-test2
[packages/gcc.git] / gcc-glibc-2.2.patch
CommitLineData
2a99d326
AM		 1diff -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
4@@ -1,4 +1,4 @@
5-#include "libio.h"
6+#include <libio.h>
7
8 /* These emulate stdio functionality, but with a different name
9 (_IO_ungetc instead of ungetc), and using _IO_FILE instead of FILE. */
10@@ -38,7 +38,11 @@
11 _IO_va_list));
12 extern int _IO_obstack_printf __P ((struct obstack *, const char *, ...));
13 #ifndef _IO_pos_BAD
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)
17+# else
18+# define _IO_pos_BAD ((_IO_off_t) -1)
19+# endif
20 #endif
21 #define _IO_clearerr(FP) ((FP)->_flags &= ~(_IO_ERR_SEEN|_IO_EOF_SEEN))
22 #define _IO_fseek(__fp, __offset, __whence) \
23diff -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
26@@ -1,5 +1,5 @@
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.
30
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
33@@ -687,6 +687,10 @@
34 /* extra: */ 0,
35 #if __GLIBC_MINOR__ >= 1
36 /* is_char: */ 0,
37+#if __GLIBC_MINOR__ >= 2
38+ /* wide: */ 0,
39+ /* i18n: */ 0,
40+#endif
41 #endif
42 #endif
43 /* pad: */ fill()
44@@ -793,6 +797,10 @@
45 /* extra: */ 0,
46 #if __GLIBC_MINOR__ >= 1
47 /* is_char: */ 0,
48+#if __GLIBC_MINOR__ >= 2
49+ /* wide: */ 0,
50+ /* i18n: */ 0,
51+#endif
52 #endif
53 #endif
54 /* pad: */ fill()
55diff -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
8b65efb8
JR		 58@@ -136,6 +136,7 @@
59 #define _IO_IS_APPENDING 0x1000
60 #define _IO_IS_FILEBUF 0x2000
61 #define _IO_BAD_SEEN 0x4000
62+#define _IO_USER_LOCK 0x8000
63
64 /* These are "formatting flags" matching the iostream fmtflags enum values. */
65 #define _IO_SKIPWS 01
2a99d326
AM		 66@@ -277,7 +278,7 @@
67 {
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;
74
75@@ -348,11 +349,11 @@
2d9f614e
JR		 76 extern _IO_size_t _IO_sgetn __P ((_IO_FILE *, void *, _IO_size_t));
77
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));
83 #else
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));
88 #endif
89
90 extern void _IO_free_backup_area __P ((_IO_FILE *));
2a99d326
AM		 91diff -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
94@@ -146,10 +146,10 @@
2d9f614e
JR		 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,
100 int DIR, int MODE));
101 #else
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,
104 int DIR, int MODE));
105 #endif
106 #define _IO_SEEKOFF(FP, OFF, DIR, MODE) JUMP3 (__seekoff, FP, OFF, DIR, MODE)
2a99d326 107@@ -160,9 +160,9 @@
2d9f614e
JR		 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));
2a99d326 112+typedef _IO_off64_t (*_IO_seekpos_t) __PMT ((_IO_FILE *, _IO_off64_t, int));
2d9f614e
JR		 113 #else
114-typedef _IO_fpos_t (*_IO_seekpos_t) __PMT ((_IO_FILE *, _IO_fpos_t, int));
2a99d326 115+typedef _IO_off_t (*_IO_seekpos_t) __PMT ((_IO_FILE *, _IO_off_t, int));
2d9f614e
JR		 116 #endif
117 #define _IO_SEEKPOS(FP, POS, FLAGS) JUMP2 (__seekpos, FP, POS, FLAGS)
118
2a99d326
AM		 119@@ -213,9 +213,9 @@
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));
125 #else
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));
128 #endif
129 #define _IO_SYSSEEK(FP, OFFSET, MODE) JUMP2 (__seek, FP, OFFSET, MODE)
130
131@@ -298,11 +298,11 @@
2d9f614e
JR		 132 /* Generic functions */
133
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));
139 #else
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));
144 #endif
145
146 extern void _IO_switch_to_main_get_area __P ((_IO_FILE *));
2a99d326
AM		 147@@ -340,22 +340,22 @@
148 _IO_size_t));
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));
158 #else
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));
163 #endif
164 extern _IO_ssize_t _IO_default_write __P ((_IO_FILE *, const void *,
165 _IO_ssize_t));
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));
171 #else
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));
174 #endif
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 @@
2d9f614e
JR		 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));
185 #else
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));
190 #endif
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 *));
2a99d326 193@@ -427,9 +427,9 @@
2d9f614e
JR		 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));
199 #else
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));
202 #endif
203 extern void _IO_str_finish __P ((_IO_FILE *, int));
204
2a99d326
AM		 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. */
208
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. */
211 #ifndef _IO_pos_BAD
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)
215 # else
216-# define _IO_pos_BAD ((_IO_fpos_t) -1)
217+# define _IO_pos_BAD ((_IO_off_t) -1)
218 # endif
219 #endif
220 /* _IO_pos_as_off converts an _IO_fpos_t value to an _IO_off_t value. */
221@@ -567,9 +567,9 @@
222 /* _IO_pos_0 is an _IO_fpos_t value indicating beginning of file. */
223 #ifndef _IO_pos_0
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)
227 # else
228-# define _IO_pos_0 ((_IO_fpos_t) 0)
229+# define _IO_pos_0 ((_IO_off_t) 0)
230 # endif
231 #endif
232
233diff -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
2d9f614e
JR		 236@@ -42,7 +42,7 @@
237
238 class parsebuf : public streambuf {
239 protected:
240- _IO_fpos_t pos_at_line_start;
241+ _IO_off_t pos_at_line_start;
242 long _line_length;
243 unsigned long __line_number;
244 char *buf_start;
2a99d326
AM		 245diff -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
248@@ -36,7 +36,7 @@
249 // then we don't need to, since in that case stdin/stdout/stderr
250 // are identical to _IO_stdin/_IO_stdout/_IO_stderr.
251
252-#include "libio.h"
253+#include <libio.h>
254
255 #ifdef _STDIO_USES_IOSTREAM
256 #define CIN_SBUF _IO_stdin_
257diff -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
260@@ -72,10 +72,10 @@
2d9f614e
JR		 261
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;
2d9f614e
JR		 266 #else
267 typedef _IO_off_t streamoff;
268-typedef _IO_fpos_t streampos;
269+typedef _IO_off_t streampos;
2d9f614e
JR		 270 #endif
271 typedef _IO_ssize_t streamsize;
272
GNU Compiler Collection: the C compiler and shared files
This page took 0.093527 seconds and 4 git commands to generate.