diff options
author | Ulrich Drepper <drepper@redhat.com> | 1996-09-07 23:56:19 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 1996-09-07 23:56:19 +0000 |
commit | 499e7464ed5c42246134fe708d783bf44a472c98 (patch) | |
tree | 785f6ad88c02bb872deac4e2034275689287e077 /libio/iopopen.c | |
parent | edf5b2d7168982e1725f41e142b77e5ec88d7bf2 (diff) | |
download | glibc-499e7464ed5c42246134fe708d783bf44a472c98.zip glibc-499e7464ed5c42246134fe708d783bf44a472c98.tar.gz glibc-499e7464ed5c42246134fe708d783bf44a472c98.tar.bz2 |
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/iopopen.c')
-rw-r--r-- | libio/iopopen.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libio/iopopen.c b/libio/iopopen.c index ca2a18e..dc1e74d 100644 --- a/libio/iopopen.c +++ b/libio/iopopen.c @@ -152,14 +152,18 @@ DEFUN(_IO_popen, (command, mode), struct locked_FILE { struct _IO_proc_file fpx; +#ifdef _IO_MTSAFE_IO _IO_lock_t lock; +#endif } *new_f; _IO_FILE *fp; new_f = (struct locked_FILE *) malloc (sizeof (struct locked_FILE)); if (new_f == NULL) return NULL; +#ifdef _IO_MTSAFE_IO new_f->fpx.file.file._lock = &new_f->lock; +#endif fp = (_IO_FILE*)&new_f->fpx; _IO_init(fp, 0); _IO_JUMPS(fp) = &_IO_proc_jumps; |