[git commit] move __libc_pthread_init prototype to pthread-functions.h
Bernhard Reutner-Fischer
rep.dot.nop at gmail.com
Fri Jun 15 12:00:43 UTC 2012
commit: http://git.uclibc.org/uClibc/commit/?id=4b06ff8e51f24313b8a24a2f9e2005ef13848964
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/master
Signed-off-by: Peter S. Mazinger <ps.m at gmx.net>
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop at gmail.com>
---
libpthread/linuxthreads/internals.h | 6 ++----
.../sysdeps/pthread/pthread-functions.h | 2 ++
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/libpthread/linuxthreads/internals.h b/libpthread/linuxthreads/internals.h
index 89aa1b6..e855f50 100644
--- a/libpthread/linuxthreads/internals.h
+++ b/libpthread/linuxthreads/internals.h
@@ -30,7 +30,7 @@
#include <bits/sigcontextinfo.h>
#include <bits/pthreadtypes.h>
-#ifdef USE_TLS
+#ifdef __UCLIBC_HAS_TLS__
#include <tls.h>
#endif
#include "descr.h"
@@ -506,8 +506,6 @@ extern pid_t __pthread_fork (struct fork_block *b) attribute_hidden;
# define LIBC_CANCEL_HANDLED() /* Nothing. */
#endif
-extern int * __libc_pthread_init (const struct pthread_functions *functions);
-
#if !defined NOT_IN_libc && !defined FLOATING_STACKS
# ifdef SHARED
# define thread_self() \
@@ -518,7 +516,7 @@ weak_extern (__pthread_thread_self)
# endif
#endif
-#ifndef USE_TLS
+#ifndef __UCLIBC_HAS_TLS__
# define __manager_thread (&__pthread_manager_thread)
#else
# define __manager_thread __pthread_manager_threadp
diff --git a/libpthread/linuxthreads/sysdeps/pthread/pthread-functions.h b/libpthread/linuxthreads/sysdeps/pthread/pthread-functions.h
index 258e1fc..44677e8 100644
--- a/libpthread/linuxthreads/sysdeps/pthread/pthread-functions.h
+++ b/libpthread/linuxthreads/sysdeps/pthread/pthread-functions.h
@@ -95,4 +95,6 @@ struct pthread_functions
/* Variable in libc.so. */
extern struct pthread_functions __libc_pthread_functions attribute_hidden;
+extern int * __libc_pthread_init (const struct pthread_functions *functions);
+
#endif /* pthread-functions.h */
More information about the uClibc-cvs
mailing list