diff options
Diffstat (limited to 'libio/stdfiles.c')
| -rw-r--r-- | libio/stdfiles.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/libio/stdfiles.c b/libio/stdfiles.c index c70d47423d..8c09c2c441 100644 --- a/libio/stdfiles.c +++ b/libio/stdfiles.c @@ -33,20 +33,19 @@ #include "libioP.h" #ifdef _IO_MTSAFE_IO -#define DEF_STDFILE(INAME, NAME, FD, CHAIN, FLAGS) \ +#define DEF_STDFILE(NAME, FD, CHAIN, FLAGS) \ static _IO_lock_t _IO_stdfile_##FD##_lock = _IO_lock_initializer; \ - struct _IO_FILE_complete INAME \ - = {{FILEBUF_LITERAL(CHAIN, FLAGS, FD), &_IO_file_jumps},}; + struct _IO_FILE_plus NAME \ + = {FILEBUF_LITERAL(CHAIN, FLAGS, FD), &_IO_file_jumps}; #else -#define DEF_STDFILE(INAME, NAME, FD, CHAIN, FLAGS) \ - struct _IO_FILE_complete INAME \ - = {{FILEBUF_LITERAL(CHAIN, FLAGS, FD), &_IO_file_jumps},}; +#define DEF_STDFILE(NAME, FD, CHAIN, FLAGS) \ + struct _IO_FILE_plus NAME \ + = {FILEBUF_LITERAL(CHAIN, FLAGS, FD), &_IO_file_jumps}; #endif -DEF_STDFILE(_IO_2_1_stdin_, _IO_stdin_, 0, 0, _IO_NO_WRITES); -DEF_STDFILE(_IO_2_1_stdout_, _IO_stdout_, 1, &_IO_2_1_stdin_.plus.file, - _IO_NO_READS); -DEF_STDFILE(_IO_2_1_stderr_, _IO_stderr_, 2, &_IO_2_1_stdout_.plus.file, +DEF_STDFILE(_IO_2_1_stdin_, 0, 0, _IO_NO_WRITES); +DEF_STDFILE(_IO_2_1_stdout_, 1, &_IO_2_1_stdin_.file, _IO_NO_READS); +DEF_STDFILE(_IO_2_1_stderr_, 2, &_IO_2_1_stdout_.file, _IO_NO_READS+_IO_UNBUFFERED); -_IO_FILE *_IO_list_all = &_IO_2_1_stderr_.plus.file; +_IO_FILE *_IO_list_all = &_IO_2_1_stderr_.file; |