From 73c115ed0b5d25e64b3495f12d1f092db7ce9715 Mon Sep 17 00:00:00 2001 From: Greg McGary Date: Tue, 4 Jul 2000 00:49:25 +0000 Subject: * 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. --- libio/libio.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libio/libio.h') diff --git a/libio/libio.h b/libio/libio.h index 6d32eedf7f..0f9a8906b6 100644 --- a/libio/libio.h +++ b/libio/libio.h @@ -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_; -- cgit v1.2.1