From: Roland McGrath <roland@hack.frob.com>
Date: Tue, 27 Aug 2013 18:09:33 +0000 (-0700)
Subject: Clean up h_errno declaration to use __thread unconditionally.
X-Git-Tag: glibc-2.19~865
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7f9d00341057eb80b43fa83956b8d7798b4dabea;p=thirdparty%2Fglibc.git

Clean up h_errno declaration to use __thread unconditionally.
---

diff --git a/ChangeLog b/ChangeLog
index d5fc59bd796..59886cc856a 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 e97d1bff8e9..a7960ebdf72 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))