diff options
author | "Steven J. Hill" <sjhill@realitydiluted.com> | 2006-08-18 02:49:28 +0000 |
---|---|---|
committer | "Steven J. Hill" <sjhill@realitydiluted.com> | 2006-08-18 02:49:28 +0000 |
commit | 5f7339fd738083baf7e42268301babd4324c3e3e (patch) | |
tree | 092a1ceb6ff0b6e83808b53fed77a4cd64609ba1 /libpthread/linuxthreads/libc_pthread_init.c | |
parent | 1191db0686f450f1e9988fc04621489ba7e0a907 (diff) | |
download | uClibc-alpine-5f7339fd738083baf7e42268301babd4324c3e3e.tar.bz2 uClibc-alpine-5f7339fd738083baf7e42268301babd4324c3e3e.tar.xz |
Merge from trunk.
Diffstat (limited to 'libpthread/linuxthreads/libc_pthread_init.c')
-rw-r--r-- | libpthread/linuxthreads/libc_pthread_init.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libpthread/linuxthreads/libc_pthread_init.c b/libpthread/linuxthreads/libc_pthread_init.c index 5a43eac04..e8482c554 100644 --- a/libpthread/linuxthreads/libc_pthread_init.c +++ b/libpthread/linuxthreads/libc_pthread_init.c @@ -28,6 +28,7 @@ #ifdef SHARED libc_hidden_proto(memcpy) #endif + #if !(USE_TLS && HAVE___THREAD) && defined __UCLIBC_HAS_XLOCALE__ libc_hidden_proto(uselocale) #endif @@ -44,10 +45,10 @@ __libc_pthread_init (functions) sizeof (__libc_pthread_functions)); #endif -#if !(USE_TLS && HAVE___THREAD) && defined __UCLIBC_HAS_XLOCALE__ +#if !(USE_TLS && HAVE___THREAD) /* 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; |