about summary refs log tree commit diff
path: root/libio/stdfiles.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1996-09-07 23:56:19 +0000
committerUlrich Drepper <drepper@redhat.com>1996-09-07 23:56:19 +0000
commit499e7464ed5c42246134fe708d783bf44a472c98 (patch)
tree785f6ad88c02bb872deac4e2034275689287e077 /libio/stdfiles.c
parentedf5b2d7168982e1725f41e142b77e5ec88d7bf2 (diff)
downloadglibc-499e7464ed5c42246134fe708d783bf44a472c98.tar.gz
glibc-499e7464ed5c42246134fe708d783bf44a472c98.tar.xz
glibc-499e7464ed5c42246134fe708d783bf44a472c98.zip
update from main archive 960907
Sat Sep  7 14:00:33 1996  David Mosberger-Tang  <davidm@azstarnet.com>

	* catgets/catgets.c (catopen): Allocate sizeof(*result) bytes
	instead of sizeof(nl_catd) (which is just a pointer!).

Sat Sep  7 19:39:19 1996  Ulrich Drepper  <drepper@cygnus.com>

	* Makefile ($(objpfx)version-info.h): Generate from Banner files.
	* version.c (banner): Add contents of version-info.h to string.

	* Makerules: If $($(subdir)-version) is available name versioned
	shared library according to this value instead of glibc's version.

	* libio/Banner: New file.

	* elf/eval.c (funcall): Write error message in case function is
	not found.
	(eval): Recognize `_' in names.
Diffstat (limited to 'libio/stdfiles.c')
-rw-r--r--libio/stdfiles.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/libio/stdfiles.c b/libio/stdfiles.c
index 1d0ef85be9..c50d5f1d8b 100644
--- a/libio/stdfiles.c
+++ b/libio/stdfiles.c
@@ -31,10 +31,16 @@ the executable file might be covered by the GNU General Public License. */
 
 #include "libioP.h"
 
-
+#ifdef _IO_MTSAFE_IO
+#define DEF_STDFILE(NAME, FD, CHAIN, FLAGS) \
+  static _IO_lock_t _IO_stdfile_##FD##_lock = _IO_lock_init; \
+  struct _IO_FILE_plus NAME \
+    = {FILEBUF_LITERAL(CHAIN, FLAGS, FD), &_IO_file_jumps}
+#else
 #define DEF_STDFILE(NAME, FD, CHAIN, FLAGS) \
   struct _IO_FILE_plus NAME \
     = {FILEBUF_LITERAL(CHAIN, FLAGS, FD), &_IO_file_jumps}
+#endif
 
 DEF_STDFILE(_IO_stdin_, 0, 0, _IO_NO_WRITES);
 DEF_STDFILE(_IO_stdout_, 1, &_IO_stdin_.file, _IO_NO_READS);