mirror of
https://sourceware.org/git/glibc.git
synced 2025-12-24 17:51:17 +03:00
* libio/libio.h (_IO_FILE): Revert type of _chain to _IO_FILE*.
* libio/libioP.h (_IO_ITER): Revert to type _IO_FILE*. (FILEBUF_LITERAL): Add cast for CHAIN init. * libio/genops.c (_IO_un_link, _IO_link_in, _IO_iter_begin): Add casts. (_IO_flush_all, _IO_flush_all_linebuffered, _IO_unbuffer_write): Revert type of `fp' to _IO_FILE*. (_IO_iter_file): Remove cast. (_IO_iter_next): Elide intermediate member reference. * libio/libio.h (_IO_FILE): Revert type of _chain to _IO_FILE*. * libio/libioP.h (_IO_ITER): Revert to type _IO_FILE*. (FILEBUF_LITERAL): Add cast for CHAIN init. * libio/genops.c (_IO_un_link, _IO_link_in, _IO_iter_begin): Add casts. (_IO_flush_all, _IO_flush_all_linebuffered, _IO_unbuffer_write): Revert type of `fp' to _IO_FILE*. (_IO_iter_file): Remove cast. (_IO_iter_next): Elide intermediate member reference.
This commit is contained in:
@@ -252,8 +252,6 @@ struct _IO_wide_data
|
||||
struct _IO_jump_t *_wide_vtable;
|
||||
};
|
||||
|
||||
struct _IO_FILE_plus;
|
||||
|
||||
struct _IO_FILE {
|
||||
int _flags; /* High-order word is _IO_MAGIC; rest is flags. */
|
||||
#define _IO_file_flags _flags
|
||||
@@ -275,7 +273,7 @@ struct _IO_FILE {
|
||||
|
||||
struct _IO_marker *_markers;
|
||||
|
||||
struct _IO_FILE_plus *_chain;
|
||||
struct _IO_FILE *_chain;
|
||||
|
||||
int _fileno;
|
||||
int _blksize;
|
||||
@@ -312,6 +310,8 @@ struct _IO_FILE_complete
|
||||
typedef struct _IO_FILE _IO_FILE;
|
||||
#endif
|
||||
|
||||
struct _IO_FILE_plus;
|
||||
|
||||
extern struct _IO_FILE_plus _IO_2_1_stdin_;
|
||||
extern struct _IO_FILE_plus _IO_2_1_stdout_;
|
||||
extern struct _IO_FILE_plus _IO_2_1_stderr_;
|
||||
|
||||
Reference in New Issue
Block a user