From cec88156d8107b78c22b988de72e8c1002118d70 Mon Sep 17 00:00:00 2001 From: "\"Steven J. Hill\"" Date: Thu, 23 Feb 2006 03:00:03 +0000 Subject: Merge from trunk. --- libpthread/linuxthreads.old/libc_pthread_init.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'libpthread/linuxthreads.old/libc_pthread_init.c') diff --git a/libpthread/linuxthreads.old/libc_pthread_init.c b/libpthread/linuxthreads.old/libc_pthread_init.c index 647a19323..0ef3b47fc 100644 --- a/libpthread/linuxthreads.old/libc_pthread_init.c +++ b/libpthread/linuxthreads.old/libc_pthread_init.c @@ -17,7 +17,6 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#define _GNU_SOURCE #include #include #include @@ -25,8 +24,10 @@ #include "internals.h" #include "sysdeps/pthread/pthread-functions.h" +libc_hidden_proto(memcpy) + #if !(USE_TLS && HAVE___THREAD) && defined __UCLIBC_HAS_XLOCALE__ -extern __locale_t __uselocale (__locale_t __dataset) __THROW attribute_hidden; +libc_hidden_proto(uselocale) #endif int __libc_multiple_threads attribute_hidden __attribute__((nocommon)); @@ -39,14 +40,14 @@ __libc_pthread_init (functions) /* We copy the content of the variable pointed to by the FUNCTIONS parameter to one in libc.so since this means access to the array can be done with one memory access instead of two. */ - __memcpy (&__libc_pthread_functions, functions, + memcpy (&__libc_pthread_functions, functions, sizeof (__libc_pthread_functions)); #endif #if !(USE_TLS && HAVE___THREAD) && defined __UCLIBC_HAS_XLOCALE__ /* Initialize thread-locale current locale to point to the global one. With __thread support, the variable's initializer takes care of this. */ - __uselocale (LC_GLOBAL_LOCALE); + uselocale (LC_GLOBAL_LOCALE); #endif return &__libc_multiple_threads; -- cgit v1.2.3