aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@gmail.com>2011-09-10 16:50:28 -0400
committerUlrich Drepper <drepper@gmail.com>2011-09-10 16:50:28 -0400
commitd063d164335938d557460bebaa7cfe388157b627 (patch)
tree92ef3f54771c0a28190b76ee45f90d16fd39714f /include
parent3ce1f2959437e952b9db4eaeed2407424f11a4d1 (diff)
downloadglibc-d063d164335938d557460bebaa7cfe388157b627.zip
glibc-d063d164335938d557460bebaa7cfe388157b627.tar.gz
glibc-d063d164335938d557460bebaa7cfe388157b627.tar.bz2
Remove support for !USE___THREAD
Diffstat (limited to 'include')
-rw-r--r--include/errno.h14
-rw-r--r--include/netdb.h22
-rw-r--r--include/resolv.h12
-rw-r--r--include/tls.h18
4 files changed, 17 insertions, 49 deletions
diff --git a/include/errno.h b/include/errno.h
index 80c7b6e..98c6080 100644
--- a/include/errno.h
+++ b/include/errno.h
@@ -21,15 +21,13 @@ extern int rtld_errno attribute_hidden;
# include <tls.h>
-# if USE___THREAD
-# undef errno
-# ifndef NOT_IN_libc
-# define errno __libc_errno
-# else
-# define errno errno /* For #ifndef errno tests. */
-# endif
-extern __thread int errno attribute_tls_model_ie;
+# undef errno
+# ifndef NOT_IN_libc
+# define errno __libc_errno
+# else
+# define errno errno /* For #ifndef errno tests. */
# endif
+extern __thread int errno attribute_tls_model_ie;
# endif /* RTLD_PRIVATE_ERRNO */
diff --git a/include/netdb.h b/include/netdb.h
index 9bbe31b..d5154c5 100644
--- a/include/netdb.h
+++ b/include/netdb.h
@@ -2,29 +2,19 @@
#include <resolv/netdb.h>
/* Macros for accessing h_errno from inside libc. */
+# undef h_errno
# ifdef _LIBC_REENTRANT
# include <tls.h>
-# if USE___THREAD
-# undef h_errno
-# ifndef NOT_IN_libc
-# define h_errno __libc_h_errno
-# else
-# define h_errno h_errno /* For #ifndef h_errno tests. */
-# endif
-extern __thread int h_errno attribute_tls_model_ie;
-# define __set_h_errno(x) (h_errno = (x))
+# ifndef NOT_IN_libc
+# define h_errno __libc_h_errno
# else
-static inline int
-__set_h_errno (int __err)
-{
- return *__h_errno_location () = __err;
-}
+# define h_errno h_errno /* For #ifndef h_errno tests. */
# endif
+extern __thread int h_errno attribute_tls_model_ie;
# else
-# undef h_errno
-# define __set_h_errno(x) (h_errno = (x))
extern int h_errno;
# endif /* _LIBC_REENTRANT */
+# define __set_h_errno(x) (h_errno = (x))
libc_hidden_proto (hstrerror)
libc_hidden_proto (innetgr)
diff --git a/include/resolv.h b/include/resolv.h
index 7ab7f87..30ea877 100644
--- a/include/resolv.h
+++ b/include/resolv.h
@@ -15,14 +15,12 @@
# ifdef _LIBC_REENTRANT
# include <tls.h>
-# if USE___THREAD
-# undef _res
-# ifndef NOT_IN_libc
-# define __resp __libc_resp
-# endif
-# define _res (*__resp)
-extern __thread struct __res_state *__resp attribute_tls_model_ie;
+# undef _res
+# ifndef NOT_IN_libc
+# define __resp __libc_resp
# endif
+# define _res (*__resp)
+extern __thread struct __res_state *__resp attribute_tls_model_ie;
# else
# ifndef __BIND_NOSTATIC
# undef _res
diff --git a/include/tls.h b/include/tls.h
deleted file mode 100644
index 8ee2b94..0000000
--- a/include/tls.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* This file defines USE___THREAD to 1 or 0 to cut down on the #if mess. */
-
-#ifndef _include_tls_h
-#define _include_tls_h 1
-
-#include_next <tls.h>
-
-#if !defined NOT_IN_libc || defined IS_IN_libpthread
-
-# define USE___THREAD 1
-
-#else
-
-# define USE___THREAD 0
-
-#endif
-
-#endif