From b639d0c9395381757a65b0ab9920e866cdec9120 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sat, 20 Nov 2004 07:16:31 +0000 Subject: Update. 2004-11-20 Jakub Jelinek * sysdeps/unix/sysv/linux/bits/socket.h (SCM_RIGHTS): Avoid comma at the end of enum if __USE_BSD is not defined. (calc_inveclosure, calc_eclosure): Skip OP_DELETED_SUBEXP nodes. --- nptl/pthreadP.h | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'nptl/pthreadP.h') diff --git a/nptl/pthreadP.h b/nptl/pthreadP.h index f73c817..2416814 100644 --- a/nptl/pthreadP.h +++ b/nptl/pthreadP.h @@ -278,7 +278,14 @@ extern int *__libc_multiple_threads_ptr attribute_hidden; #endif /* Find a thread given its TID. */ -extern struct pthread *__find_thread_by_id (pid_t tid) attribute_hidden; +extern struct pthread *__find_thread_by_id (pid_t tid) attribute_hidden +#ifdef SHARED +; +#else +weak_function; +#define __find_thread_by_id(tid) \ + (__find_thread_by_id ? (__find_thread_by_id) (tid) : (struct pthread *) NULL) +#endif extern void __pthread_init_static_tls (struct link_map *) attribute_hidden; @@ -450,4 +457,10 @@ extern void __nptl_deallocate_tsd (void) attribute_hidden; extern int __nptl_setxid (struct xid_command *cmdp) attribute_hidden; +#ifdef SHARED +# define PTHREAD_STATIC_FN_REQUIRE(name) +#else +# define PTHREAD_STATIC_FN_REQUIRE(name) __asm (".globl " #name); +#endif + #endif /* pthreadP.h */ -- cgit v1.1