use __h_errno_location for h_errno

we do not bother making h_errno thread-local since the only interfaces
that use it are inherently non-thread-safe. but still use the
potentially-thread-local ABI to access it just to avoid lock-in.

diff --git a/include/netdb.h b/include/netdb.h
index a480d82f4ae94cb8924e6177683b69fd6f86ef7d..33b7a0abae85754d5203bea3eb315f1c10d0d12f 100644 (file)
--- a/include/netdb.h
+++ b/include/netdb.h
@@ -128,7 +128,11 @@ struct hostent *gethostbyaddr (const void *, socklen_t, int);
 int gethostbyaddr_r(const void *, socklen_t, int, struct hostent *, char *, size_t, struct hostent **, int *);
 int getservbyport_r(int, const char *, struct servent *, char *, size_t, struct servent **);
 int getservbyname_r(const char *, const char *, struct servent *, char *, size_t, struct servent **);
-extern int h_errno;
+#ifdef __GNUC__
+__attribute__((const))
+#endif
+int *__h_errno_location(void);
+#define h_errno (*__h_errno_location())
 #define EAI_NODATA     -5
 #define EAI_ADDRFAMILY -9
 #define EAI_INPROGRESS -100

diff --git a/src/network/h_errno.c b/src/network/h_errno.c
index 73ead04692cf75ca9cc621f7215aaf0b09db1abb..5560234c9953358ea8755f44ae3b8a90ee7552cf 100644 (file)
--- a/src/network/h_errno.c
+++ b/src/network/h_errno.c
@@ -1 +1,9 @@
+#include <netdb.h>
+
+#undef h_errno;
 int h_errno;
+
+int *__h_errno_location(void)
+{
+       return &h_errno;
+}

diff --git a/src/network/res_query.c b/src/network/res_query.c
index 42009992d44b9cec63c5799f74583489bbd3b67d..c3ad10901ac6fbbe4120c64f888be65e98e49452 100644 (file)
--- a/src/network/res_query.c
+++ b/src/network/res_query.c
@@ -1,3 +1,4 @@
+#define _GNU_SOURCE
 #include <netdb.h>
 #include "__dns.h"
 #include "libc.h"