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/libioP.h | |
| 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/libioP.h')
| -rw-r--r-- | libio/libioP.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/libio/libioP.h b/libio/libioP.h index ac4df17..f5e6dc5 100644 --- a/libio/libioP.h +++ b/libio/libioP.h @@ -342,10 +342,18 @@ extern int _IO_vscanf __P((const char *, _IO_va_list)); #else #define _IO_FJUMP &_IO_file_jumps, #endif +#ifdef _IO_MTSAFE_IO /* check following! */ #define FILEBUF_LITERAL(CHAIN, FLAGS, FD) \ { _IO_MAGIC+_IO_LINKED+_IO_IS_FILEBUF+FLAGS, \ - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, CHAIN, _IO_FJUMP FD} + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, CHAIN, _IO_FJUMP FD, \ + 0, 0, 0, 0, { 0 }, &_IO_stdfile_##FD##_lock } +#else +/* check following! */ +#define FILEBUF_LITERAL(CHAIN, FLAGS, FD) \ + { _IO_MAGIC+_IO_LINKED+_IO_IS_FILEBUF+FLAGS, \ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, CHAIN, _IO_FJUMP FD } +#endif /* VTABLE_LABEL defines NAME as of the CLASS class. CNLENGTH is strlen(#CLASS). */ |