4 files changed, 9 insertions, 7 deletions
diff --git a/libpthread/linuxthreads.old/attr.c b/libpthread/linuxthreads.old/attr.c
index a8dfb335e..e5f110b0e 100644
--- a/libpthread/linuxthreads.old/attr.c
+++ b/libpthread/linuxthreads.old/attr.c
@@ -15,6 +15,7 @@
 /* changed for uClibc */
 #define __sched_get_priority_min sched_get_priority_min
 #define __sched_get_priority_max sched_get_priority_max
+#define __getpagesize getpagesize
 
 /* Handling of thread attributes */
 
@@ -25,8 +26,6 @@
 #include "pthread.h"
 #include "internals.h"
 
-extern int __getpagesize(void);
-
 /* NOTE: With uClibc I don't think we need this versioning stuff.
  * Therefore, define the function pthread_attr_init() here using
  * a strong symbol. */
diff --git a/libpthread/linuxthreads.old/forward.c b/libpthread/linuxthreads.old/forward.c
index 90ec6ef3a..8373b4d41 100644
--- a/libpthread/linuxthreads.old/forward.c
+++ b/libpthread/linuxthreads.old/forward.c
@@ -23,6 +23,7 @@
 
 #include <libc-internal.h>
 
+libc_hidden_def(exit)
 
 /* Pointers to the libc functions.  */
 struct pthread_functions __libc_pthread_functions attribute_hidden;
@@ -101,7 +102,7 @@ FORWARD (pthread_equal, (pthread_t thread1, pthread_t thread2),
 
 
 /* Use an alias to avoid warning, as pthread_exit is declared noreturn.  */
-FORWARD2 (__pthread_exit, void, (void *retval), (retval), __exit (EXIT_SUCCESS))
+FORWARD2 (__pthread_exit, void, (void *retval), (retval), exit (EXIT_SUCCESS))
 strong_alias (__pthread_exit, pthread_exit);
 
 
diff --git a/libpthread/linuxthreads.old/libc_pthread_init.c b/libpthread/linuxthreads.old/libc_pthread_init.c
index 647a19323..e8dd2e975 100644
--- a/libpthread/linuxthreads.old/libc_pthread_init.c
+++ b/libpthread/linuxthreads.old/libc_pthread_init.c
@@ -25,8 +25,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 +41,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;
diff --git a/libpthread/linuxthreads.old/manager.c b/libpthread/linuxthreads.old/manager.c
index 3e42ccb85..33e05f216 100644
--- a/libpthread/linuxthreads.old/manager.c
+++ b/libpthread/linuxthreads.old/manager.c
@@ -14,7 +14,7 @@
 
 /* The "thread manager" thread: manages creation and termination of threads */
 
-/* mods for uClibc: getpwd and getpagesize are the syscalls */
+/* mods for uClibc: getpid and getpagesize are the syscalls */
 #define __getpid getpid
 #define __getpagesize getpagesize