summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter S. Mazinger <ps.m@gmx.net>2006-03-09 15:18:36 +0000
committerPeter S. Mazinger <ps.m@gmx.net>2006-03-09 15:18:36 +0000
commit41db918cae7e12e2d0c3873693b99622de52a4af (patch)
treeef456773a330415906d01b1114672ca5ad2a2050
parente9cc671723af4e61eeda9a865267037e33286326 (diff)
Not the best idea moving libc_hidden_proto to uClibc_glue.h
-rw-r--r--libpthread/linuxthreads/libc_pthread_init.c4
-rw-r--r--libpthread/linuxthreads/sysdeps/pthread/uClibc-glue.h1
2 files changed, 4 insertions, 1 deletions
diff --git a/libpthread/linuxthreads/libc_pthread_init.c b/libpthread/linuxthreads/libc_pthread_init.c
index 5ed9ab6bf..e346ed275 100644
--- a/libpthread/linuxthreads/libc_pthread_init.c
+++ b/libpthread/linuxthreads/libc_pthread_init.c
@@ -29,6 +29,10 @@
libc_hidden_proto(memcpy)
#endif
+#if !(USE_TLS && HAVE___THREAD)
+libc_hidden_proto(uselocale)
+#endif
+
int *
__libc_pthread_init (functions)
const struct pthread_functions *functions;
diff --git a/libpthread/linuxthreads/sysdeps/pthread/uClibc-glue.h b/libpthread/linuxthreads/sysdeps/pthread/uClibc-glue.h
index 5a72b7703..f81c22945 100644
--- a/libpthread/linuxthreads/sysdeps/pthread/uClibc-glue.h
+++ b/libpthread/linuxthreads/sysdeps/pthread/uClibc-glue.h
@@ -36,7 +36,6 @@ extern int __cxa_atexit (void (*func) (void *), void *arg, void *d);
#ifdef __UCLIBC_HAS_XLOCALE__
# define __uselocale(x) uselocale(x)
-libc_hidden_proto(uselocale)
#else
# define __uselocale(x) ((void)0)
#endif