aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--linuxthreads/pthread.c20
1 files changed, 11 insertions, 9 deletions
diff --git a/linuxthreads/pthread.c b/linuxthreads/pthread.c
index 3c978a5bc0..8110317736 100644
--- a/linuxthreads/pthread.c
+++ b/linuxthreads/pthread.c
@@ -38,23 +38,25 @@
# error "This must not happen; new kernel assumed but old headers"
#endif
-#ifdef USE_TLS
-
-/* We need only a few variables. */
-static pthread_descr manager_thread;
-
-#else
-
+#if !(USE_TLS && HAVE___THREAD)
/* These variables are used by the setup code. */
extern int _errno;
extern int _h_errno;
/* We need the global/static resolver state here. */
-#include <resolv.h>
-#undef _res
+# include <resolv.h>
+# undef _res
+#endif
extern struct __res_state _res;
+#ifdef USE_TLS
+
+/* We need only a few variables. */
+static pthread_descr manager_thread;
+
+#else
+
/* Descriptor of the initial thread */
struct _pthread_descr_struct __pthread_initial_thread = {