aboutsummaryrefslogtreecommitdiff
path: root/libio
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1996-09-13 03:21:39 +0000
committerUlrich Drepper <drepper@redhat.com>1996-09-13 03:21:39 +0000
commitfafaa44ef0176da243b19e4d68bf2ffc3bbb4f88 (patch)
tree33499236a84d75a7c87657aaa18602c9db05d697 /libio
parentae2ddc98c17c17897398c8d960d984789ecab0d9 (diff)
downloadglibc-fafaa44ef0176da243b19e4d68bf2ffc3bbb4f88.zip
glibc-fafaa44ef0176da243b19e4d68bf2ffc3bbb4f88.tar.gz
glibc-fafaa44ef0176da243b19e4d68bf2ffc3bbb4f88.tar.bz2
update from main archive 960912
Fri Sep 13 04:33:08 1996 Ulrich Drepper <drepper@cygnus.com> * sched.h: New file. helper to access posix/sched.h. * posix/sched.h: Change `sched_params' to `sched_param' to follow POSIX.4. Thu Sep 12 20:12:40 1996 Ulrich Drepper <drepper@cygnus.com> * db/makedb.c (usage): Print bug report address separately to ease translators task. * catgets/gencat.c (usage): Likewise. * locale/locale.c (usage): Likewise. * locale/localedef.c (usage): Likewise. 1996-09-12 Paul Eggert <eggert@twinsun.com> * time/strftime.c (my_localtime_r): Define if ! HAVE_LOCALTIME_R, and #define localtime_r to it. If _LIBC, use __localtime_r instead. (my_gmtime_r): Similar, except it's not needed if ! HAVE_TM_GMTOFF. Thu Sep 12 14:03:29 1996 Ulrich Drepper <drepper@cygnus.com> * crypt/Makefile: Include Makeconfig and add crypt object dir to rpath-link so that running the check finds the new library. * crypt/cert.c: provide correct prototypes to prevent warnings. Reported by Andreas Jaeger. * sysdeps/mach/hurd/Makefile (rpath-link): Don't use += because old and new value must be glued using `:'. Reported by Marcus Daniels.
Diffstat (limited to 'libio')
-rw-r--r--libio/Makefile2
-rw-r--r--libio/libio.h4
2 files changed, 2 insertions, 4 deletions
diff --git a/libio/Makefile b/libio/Makefile
index 1d0ec93..902d63f 100644
--- a/libio/Makefile
+++ b/libio/Makefile
@@ -40,7 +40,7 @@ include ../Makeconfig
ifneq (,$(filter %REENTRANT, $(defines)))
routines += clearerr_u feof_u ferror_u fputc_u getc_u getchar_u \
- iofflush_u putc_u putchar_u ioflockfile
+ iofflush_u putc_u putchar_u
CPPFLAGS += -D_IO_MTSAFE_IO
endif
diff --git a/libio/libio.h b/libio/libio.h
index 36e839f..e174ee1 100644
--- a/libio/libio.h
+++ b/libio/libio.h
@@ -150,9 +150,7 @@ typedef struct
/* Handle lock. */
#ifdef _IO_MTSAFE_IO
-#include <pthread.h>
-typedef pthread_mutex_t _IO_lock_t;
-#define _IO_lock_init PTHREAD_MUTEX_INITIALIZER
+#include <stdio-lock.h>
#else
typedef void _IO_lock_t;
#endif