Clean up h_errno declaration to use __thread unconditionally.

This commit is contained in:
Roland McGrath 2013-08-27 11:09:33 -07:00
parent fb431262c1
commit 7f9d003410
2 changed files with 10 additions and 10 deletions

View File

@ -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].

View File

@ -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))