From a1219cfa33d96f0d656e6e63c6bb4872e10c265a Mon Sep 17 00:00:00 2001
From: Philippe Houdoin <philippe.houdoin@gmail.com>
Date: Tue, 3 Feb 2004 00:01:00 +0000
Subject: [PATCH] Removing #undef h_errno and extern int h_errno declaration,
 as we must use all the same netdb.h definition, which in turn use TLS to
 support a thread-safe h_errno global variable...

git-svn-id: file:///srv/svn/repos/haiku/trunk/current@6473 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/kits/network/libnet/compat.c        | 7 ++-----
 src/kits/network/libnet/getaddrinfo.c   | 4 ----
 src/kits/network/libnet/gethostnamadr.c | 2 --
 src/kits/network/libnet/getnameinfo.c   | 4 ----
 src/kits/network/libnet/getnetnamadr.c  | 4 ----
 src/kits/network/libnet/res_debug.c     | 4 ----
 src/kits/network/libnet/res_mkquery.c   | 4 ----
 src/kits/network/libnet/res_query.c     | 4 +---
 8 files changed, 3 insertions(+), 30 deletions(-)

diff --git a/src/kits/network/libnet/compat.c b/src/kits/network/libnet/compat.c
index 9783c4dfbe..de5acaf6a7 100644
--- a/src/kits/network/libnet/compat.c
+++ b/src/kits/network/libnet/compat.c
@@ -16,9 +16,6 @@
 
 #include <TLS.h>
 
-extern int h_errno;
-#undef h_errno
-	// was defined by netdb.h
 static int32 h_errno_tls;
 
 void initialize_before(void);
@@ -70,9 +67,9 @@ _EXPORT void herror(const char *error)
 	printf("herror() not yet supported.");
 }
 
-_EXPORT int *_h_errnop()
+_EXPORT int * _h_errnop()
 {
-	return (int *)tls_address(h_errno_tls);
+	return (int *) tls_address(h_errno_tls);
 }
 
 
diff --git a/src/kits/network/libnet/getaddrinfo.c b/src/kits/network/libnet/getaddrinfo.c
index 73ed708fe2..047e29ad75 100644
--- a/src/kits/network/libnet/getaddrinfo.c
+++ b/src/kits/network/libnet/getaddrinfo.c
@@ -96,10 +96,6 @@
  */
 #include <stdarg.h>
 
-#undef h_errno
-	// was defined by netdb.h
-extern int h_errno;
-
 #ifdef YP
 #include <rpc/rpc.h>
 #include <rpcsvc/yp.h>
diff --git a/src/kits/network/libnet/gethostnamadr.c b/src/kits/network/libnet/gethostnamadr.c
index ef8141b3de..0698c08428 100644
--- a/src/kits/network/libnet/gethostnamadr.c
+++ b/src/kits/network/libnet/gethostnamadr.c
@@ -127,8 +127,6 @@ typedef union {
 
 static struct hostent *getanswer (const querybuf *, int, const char *, int);
 
-extern int h_errno;
-
 int
 _hokchar(p)
 	const char *p;
diff --git a/src/kits/network/libnet/getnameinfo.c b/src/kits/network/libnet/getnameinfo.c
index 386093fd04..a082b39fb1 100644
--- a/src/kits/network/libnet/getnameinfo.c
+++ b/src/kits/network/libnet/getnameinfo.c
@@ -52,10 +52,6 @@
 #include <string.h>
 #include <stddef.h>
 
-#undef h_errno
-	// was defined by netdb.h
-extern int h_errno;
-
 static const struct afd {
 	int a_af;
 	int a_addrlen;
diff --git a/src/kits/network/libnet/getnetnamadr.c b/src/kits/network/libnet/getnetnamadr.c
index e53c020d4a..eedadf8f15 100644
--- a/src/kits/network/libnet/getnetnamadr.c
+++ b/src/kits/network/libnet/getnetnamadr.c
@@ -83,10 +83,6 @@
 #include <errno.h>
 #include <string.h>
 
-#undef h_errno
-	// was defined by netdb.h
-extern int h_errno;
-
 struct netent *_getnetbyaddr (in_addr_t net, int type);
 struct netent *_getnetbyname (const char *name);
 
diff --git a/src/kits/network/libnet/res_debug.c b/src/kits/network/libnet/res_debug.c
index feea41ad7f..089bf90d2c 100644
--- a/src/kits/network/libnet/res_debug.c
+++ b/src/kits/network/libnet/res_debug.c
@@ -91,10 +91,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#undef h_errno
-	// was defined by netdb.h
-extern int h_errno;
-
 extern const char *_res_opcodes[];
 extern const char *_res_resultcodes[];
 
diff --git a/src/kits/network/libnet/res_mkquery.c b/src/kits/network/libnet/res_mkquery.c
index 6062f8fe6b..cc573842c7 100644
--- a/src/kits/network/libnet/res_mkquery.c
+++ b/src/kits/network/libnet/res_mkquery.c
@@ -64,10 +64,6 @@
 #include <resolv.h>
 #include <string.h>
 
-#undef h_errno
-	// was defined by netdb.h
-extern int h_errno;
-
 /*
  * Form all types of queries.
  * Returns the size of the result or -1.
diff --git a/src/kits/network/libnet/res_query.c b/src/kits/network/libnet/res_query.c
index b6db3acfa4..131aa3195f 100644
--- a/src/kits/network/libnet/res_query.c
+++ b/src/kits/network/libnet/res_query.c
@@ -75,9 +75,7 @@
 #endif
 
 const char *hostalias (const char *);
-#undef h_errno
-	// was defined by netdb.h
-int h_errno = 0;
+
 extern int res_opt (int, u_char *, int, int);
 
 /*