From 5f0366c2cb002d1d067abe28c4980930015fff36 Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Tue, 19 Apr 2005 23:19:23 +0000
Subject: [PATCH] only define _REENTRANT if not already defined, and only in
 setup.h

---
 lib/hostares.c | 2 --
 lib/hostasyn.c | 2 --
 lib/hostip.c   | 2 --
 lib/hostip4.c  | 2 --
 lib/hostip6.c  | 2 --
 lib/hostsyn.c  | 2 --
 lib/hostthre.c | 2 --
 lib/setup.h    | 4 ++--
 8 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/lib/hostares.c b/lib/hostares.c
index 13c0dc2370..af02d8dc89 100644
--- a/lib/hostares.c
+++ b/lib/hostares.c
@@ -26,8 +26,6 @@
 #include <string.h>
 #include <errno.h>
 
-#define _REENTRANT
-
 #if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
 #include <malloc.h>
 #else
diff --git a/lib/hostasyn.c b/lib/hostasyn.c
index e37db27559..d1b7cdd186 100644
--- a/lib/hostasyn.c
+++ b/lib/hostasyn.c
@@ -26,8 +26,6 @@
 #include <string.h>
 #include <errno.h>
 
-#define _REENTRANT
-
 #if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
 #include <malloc.h>
 #else
diff --git a/lib/hostip.c b/lib/hostip.c
index 233d81cf36..91f59af2ab 100644
--- a/lib/hostip.c
+++ b/lib/hostip.c
@@ -26,8 +26,6 @@
 #include <string.h>
 #include <errno.h>
 
-#define _REENTRANT
-
 #if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
 #include <malloc.h>
 #else
diff --git a/lib/hostip4.c b/lib/hostip4.c
index 178f3b9daa..cebc74d589 100644
--- a/lib/hostip4.c
+++ b/lib/hostip4.c
@@ -26,8 +26,6 @@
 #include <string.h>
 #include <errno.h>
 
-#define _REENTRANT
-
 #if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
 #include <malloc.h>
 #else
diff --git a/lib/hostip6.c b/lib/hostip6.c
index 0c5eaa03c9..b273efe006 100644
--- a/lib/hostip6.c
+++ b/lib/hostip6.c
@@ -26,8 +26,6 @@
 #include <string.h>
 #include <errno.h>
 
-#define _REENTRANT
-
 #if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
 #include <malloc.h>
 #else
diff --git a/lib/hostsyn.c b/lib/hostsyn.c
index 38030b7f0a..a385632e92 100644
--- a/lib/hostsyn.c
+++ b/lib/hostsyn.c
@@ -26,8 +26,6 @@
 #include <string.h>
 #include <errno.h>
 
-#define _REENTRANT
-
 #if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
 #include <malloc.h>
 #else
diff --git a/lib/hostthre.c b/lib/hostthre.c
index b05729404a..dd3f896c9e 100644
--- a/lib/hostthre.c
+++ b/lib/hostthre.c
@@ -26,8 +26,6 @@
 #include <string.h>
 #include <errno.h>
 
-#define _REENTRANT
-
 #if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
 #include <malloc.h>
 #else
diff --git a/lib/setup.h b/lib/setup.h
index a248e0669a..b44e777c96 100644
--- a/lib/setup.h
+++ b/lib/setup.h
@@ -95,13 +95,13 @@ typedef unsigned char bool;
 #define FORMAT_OFF_T "ld"
 #endif
 
-/*#ifdef NEED_REENTRANT*/
+#ifndef _REENTRANT
 /* Solaris needs _REENTRANT set for a few function prototypes and things to
    appear in the #include files. We need to #define it before all #include
    files. Unixware needs it to build proper reentrant code. Others may also
    need it. */
 #define _REENTRANT
-/*#endif */
+#endif
 
 #include <stdio.h>
 #ifdef HAVE_ASSERT_H