summary refs log tree commit diff
path: root/libio/libio.h
diff options
context:
space:
mode:
authorGreg McGary <greg@mcgary.org>2000-07-04 00:49:25 +0000
committerGreg McGary <greg@mcgary.org>2000-07-04 00:49:25 +0000
commit73c115ed0b5d25e64b3495f12d1f092db7ce9715 (patch)
tree75d594857f65599d4dc43be9e00afee6b4f8120a /libio/libio.h
parenta88b96f496c0214424db1219d21ce669fbc102a0 (diff)
downloadglibc-73c115ed0b5d25e64b3495f12d1f092db7ce9715.tar.gz
glibc-73c115ed0b5d25e64b3495f12d1f092db7ce9715.tar.xz
glibc-73c115ed0b5d25e64b3495f12d1f092db7ce9715.zip
* 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.
Diffstat (limited to 'libio/libio.h')
-rw-r--r--libio/libio.h6
1 files changed, 3 insertions, 3 deletions
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_;