This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH] Assume that _IO_MTSAFE_IO is always defined in libio/stdfiles.c
- From: Florian Weimer <fw at deneb dot enyo dot de>
- To: libc-alpha at sourceware dot org
- Date: Tue, 19 Jun 2018 11:01:52 +0200
- Subject: [PATCH] Assume that _IO_MTSAFE_IO is always defined in libio/stdfiles.c
2018-06-19 Florian Weimer <fweimer@redhat.com>
* libio/stdfiles.c (DEF_STDFILE): Assume that _IO_MTSAFE_IO is
always defined.
diff --git a/libio/stdfiles.c b/libio/stdfiles.c
index 8d96f0b65c..18e1172ad0 100644
--- a/libio/stdfiles.c
+++ b/libio/stdfiles.c
@@ -33,22 +33,13 @@
#include "libioP.h"
-#ifdef _IO_MTSAFE_IO
-# define DEF_STDFILE(NAME, FD, CHAIN, FLAGS) \
+#define DEF_STDFILE(NAME, FD, CHAIN, FLAGS) \
static _IO_lock_t _IO_stdfile_##FD##_lock = _IO_lock_initializer; \
static struct _IO_wide_data _IO_wide_data_##FD \
= { ._wide_vtable = &_IO_wfile_jumps }; \
struct _IO_FILE_plus NAME \
= {FILEBUF_LITERAL(CHAIN, FLAGS, FD, &_IO_wide_data_##FD), \
&_IO_file_jumps};
-#else
-# define DEF_STDFILE(NAME, FD, CHAIN, FLAGS) \
- static struct _IO_wide_data _IO_wide_data_##FD \
- = { ._wide_vtable = &_IO_wfile_jumps }; \
- struct _IO_FILE_plus NAME \
- = {FILEBUF_LITERAL(CHAIN, FLAGS, FD, &_IO_wide_data_##FD), \
- &_IO_file_jumps};
-#endif
DEF_STDFILE(_IO_2_1_stdin_, 0, 0, _IO_NO_WRITES);
DEF_STDFILE(_IO_2_1_stdout_, 1, &_IO_2_1_stdin_, _IO_NO_READS);