about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRoland McGrath <roland@hack.frob.com>2013-08-27 11:09:33 -0700
committerRoland McGrath <roland@hack.frob.com>2013-08-27 11:09:33 -0700
commit7f9d00341057eb80b43fa83956b8d7798b4dabea (patch)
tree312a5cfe421486461694b8773dcf19995a77da5b
parentfb431262c12a8e2630225518300a4e1e0c4e918b (diff)
downloadglibc-7f9d00341057eb80b43fa83956b8d7798b4dabea.tar.gz
glibc-7f9d00341057eb80b43fa83956b8d7798b4dabea.tar.xz
glibc-7f9d00341057eb80b43fa83956b8d7798b4dabea.zip
Clean up h_errno declaration to use __thread unconditionally.
-rw-r--r--ChangeLog5
-rw-r--r--include/netdb.h15
2 files changed, 10 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index d5fc59bd79..59886cc856 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2013-08-27  Roland McGrath  <roland@hack.frob.com>
 
+	* include/netdb.h [!_ISOMAC]:
+	Don't include <tls.h>.
+	(h_errno, __libc_h_errno): Move declaration and macros out of
+	[_LIBC_REENTRANT].
+
 	* include/resolv.h [_RESOLV_H_]:
 	Don't include <tls.h>.
 	(__resp, _res): Move declaration and macro out of [_LIBC_REENTRANT].
diff --git a/include/netdb.h b/include/netdb.h
index e97d1bff8e..a7960ebdf7 100644
--- a/include/netdb.h
+++ b/include/netdb.h
@@ -6,17 +6,12 @@
 /* Macros for accessing h_errno from inside libc.  */
 # if !defined NOT_IN_libc || defined IN_LIB
 #  undef  h_errno
-#  ifdef _LIBC_REENTRANT
-#   include <tls.h>
-#   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;
+#  ifndef NOT_IN_libc
+#   define h_errno __libc_h_errno
 #  else
-extern int h_errno;
-#  endif	/* _LIBC_REENTRANT */
+#   define h_errno h_errno	/* For #ifndef h_errno tests.  */
+#  endif
+extern __thread int h_errno attribute_tls_model_ie;
 # endif /* !NOT_IN_libc || IN_LIB */
 # define __set_h_errno(x) (h_errno = (x))