diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2001-08-14 23:29:55 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2001-08-14 23:29:55 +0000 |
| commit | 5db915715f800d0858346bfbb5eea6aff4287ebd (patch) | |
| tree | 3e80f9b69ab93f869da0c78cc63eb4ebf5149230 /linuxthreads/cancel.c | |
| parent | ecad39f050c89d63673101ae0d6b54fb2dfbed1b (diff) | |
| download | glibc-5db915715f800d0858346bfbb5eea6aff4287ebd.tar.gz glibc-5db915715f800d0858346bfbb5eea6aff4287ebd.tar.xz glibc-5db915715f800d0858346bfbb5eea6aff4287ebd.zip | |
Update.
2001-08-14 Jakub Jelinek <jakub@redhat.com> * resolv/nss_dns/dns-host.c (RESOLVSORT): Define. (addrsort): New function. * resolv/gethnamaddr.c (RESOLVSORT): Define. 2001-08-14 Jakub Jelinek <jakub@redhat.com> * string/strsignal.c (free_mem): Remove. 2001-08-14 Andreas Jaeger <aj@suse.de> * inet/inet_ntoa.c (free_mem): Remove, it's not used anymore. Closes PR libc/2477, reported by Dylan Alex Simon <dylan@dylex.caltech.edu>. 2001-08-14 Ulrich Drepper <drepper@redhat.com> * locale/Makefile (aux): Add xlocale. * locale/xlocale.c: New file. * include/locale.c (_nl_C_locobj): Declare. * iconv/gconv_charset.h: Use __tolower_l, __isdigit_l, __isspace_l with _nl_C_locobj instead of tolower, isdigit, isspace. * iconv/gconv_conf.c: Likewise. * iconv/gconv_int.h: Likewise. * iconv/gconv_open.c: Likewise. * locale/newlocale.c: Minor cleanups.
Diffstat (limited to 'linuxthreads/cancel.c')
| -rw-r--r-- | linuxthreads/cancel.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/linuxthreads/cancel.c b/linuxthreads/cancel.c index 0d5298b742..5649bc41c6 100644 --- a/linuxthreads/cancel.c +++ b/linuxthreads/cancel.c @@ -207,9 +207,12 @@ void __pthread_perform_cleanup(char *currentframe) } #ifndef SHARED -/* We need a hook to force the cancelation wrappers to be linked in when - static libpthread is used. */ +/* We need a hook to force the cancelation wrappers and file locking + to be linked in when static libpthread is used. */ extern const int __pthread_provide_wrappers; -static const int * const __pthread_require_wrappers = +static const int *const __pthread_require_wrappers = &__pthread_provide_wrappers; +extern const int __pthread_provide_lockfile; +static const int *const __pthread_require_lockfile = + &__pthread_provide_lockfile; #endif |