diff options
| author | Greg McGary <greg@mcgary.org> | 2000-07-04 00:49:25 +0000 |
|---|---|---|
| committer | Greg McGary <greg@mcgary.org> | 2000-07-04 00:49:25 +0000 |
| commit | 73c115ed0b5d25e64b3495f12d1f092db7ce9715 (patch) | |
| tree | 75d594857f65599d4dc43be9e00afee6b4f8120a /libio/libioP.h | |
| parent | a88b96f496c0214424db1219d21ce669fbc102a0 (diff) | |
* 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/libioP.h')
| -rw-r--r-- | libio/libioP.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/libio/libioP.h b/libio/libioP.h index 9fb418869c..6cc23a67bd 100644 --- a/libio/libioP.h +++ b/libio/libioP.h @@ -323,7 +323,7 @@ struct _IO_cookie_file /* Iterator type for walking global linked list of _IO_FILE objects. */ -typedef struct _IO_FILE_plus *_IO_ITER; +typedef struct _IO_FILE *_IO_ITER; /* Generic functions */ @@ -708,12 +708,12 @@ extern int _IO_vscanf __P ((const char *, _IO_va_list)); # ifdef _IO_USE_OLD_IO_FILE # define FILEBUF_LITERAL(CHAIN, FLAGS, FD, WDP) \ { _IO_MAGIC+_IO_LINKED+_IO_IS_FILEBUF+FLAGS, \ - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, CHAIN, FD, \ - 0, _IO_pos_BAD, 0, 0, { 0 }, &_IO_stdfile_##FD##_lock } + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, (_IO_FILE *) CHAIN, FD, \ + 0, _IO_pos_BAD, 0, 0, { 0 }, &_IO_stdfile_##FD##_lock } # else # define FILEBUF_LITERAL(CHAIN, FLAGS, FD, WDP) \ { _IO_MAGIC+_IO_LINKED+_IO_IS_FILEBUF+FLAGS, \ - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, CHAIN, FD, \ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, (_IO_FILE *) CHAIN, FD, \ 0, _IO_pos_BAD, 0, 0, { 0 }, &_IO_stdfile_##FD##_lock, _IO_pos_BAD,\ NULL, WDP, 0 } # endif @@ -721,11 +721,12 @@ extern int _IO_vscanf __P ((const char *, _IO_va_list)); # ifdef _IO_USE_OLD_IO_FILE # define FILEBUF_LITERAL(CHAIN, FLAGS, FD, WDP) \ { _IO_MAGIC+_IO_LINKED+_IO_IS_FILEBUF+FLAGS, \ - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, CHAIN, FD, 0, _IO_pos_BAD } + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, (_IO_FILE *) CHAIN, FD, \ + 0, _IO_pos_BAD } # else # define FILEBUF_LITERAL(CHAIN, FLAGS, FD, WDP) \ { _IO_MAGIC+_IO_LINKED+_IO_IS_FILEBUF+FLAGS, \ - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, CHAIN, FD, \ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, (_IO_FILE *) CHAIN, FD, \ 0, _IO_pos_BAD, 0, 0, { 0 }, 0, _IO_pos_BAD, \ NULL, WDP, 0 } # endif |