Removed ACE_HAS_TIME_R in favor of using existing mechanism of

ACE_HAS_REENTRANT_FUNCTIONS, and then adding
ACE_LACKS_NETDB_REENTRANT_FUNCTIONS and also
ACE_LACKS_PWD_REENTRANT_FUNCTIONS.  Created a new lacks called
ACE_LACKS_RAND_REENTRANT_FUNCTIONS to match the previous two.

7 files changed, 56 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index 80ffb6428d2..672393ea217 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+Thu Apr 27 12:41:42 2000  James C. Hu  <jxh@entera.com>
+
+        * ace/OS.i:
+        * ace/OS.cpp:
+        * ace/config-freebsd-pthread.h:
+        * ace/README:
+
+          Removed ACE_HAS_TIME_R in favor of using existing
+          mechanism of ACE_HAS_REENTRANT_FUNCTIONS, and then
+          adding ACE_LACKS_NETDB_REENTRANT_FUNCTIONS and
+          also ACE_LACKS_PWD_REENTRANT_FUNCTIONS.  Created a
+          new lacks called ACE_LACKS_RAND_REENTRANT_FUNCTIONS
+          to match the previous two.  FreeBSD can now use its
+          native *time_r functions.
+
 Thu Apr 27 10:55:11 2000  Darrell Brunsch <brunsch@uci.edu>
 
         These changes bring the Windows CE port up to date.  It currently
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 80ffb6428d2..672393ea217 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,18 @@
+Thu Apr 27 12:41:42 2000  James C. Hu  <jxh@entera.com>
+
+        * ace/OS.i:
+        * ace/OS.cpp:
+        * ace/config-freebsd-pthread.h:
+        * ace/README:
+
+          Removed ACE_HAS_TIME_R in favor of using existing
+          mechanism of ACE_HAS_REENTRANT_FUNCTIONS, and then
+          adding ACE_LACKS_NETDB_REENTRANT_FUNCTIONS and
+          also ACE_LACKS_PWD_REENTRANT_FUNCTIONS.  Created a
+          new lacks called ACE_LACKS_RAND_REENTRANT_FUNCTIONS
+          to match the previous two.  FreeBSD can now use its
+          native *time_r functions.
+
 Thu Apr 27 10:55:11 2000  Darrell Brunsch <brunsch@uci.edu>
 
         These changes bring the Windows CE port up to date.  It currently
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 80ffb6428d2..672393ea217 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,18 @@
+Thu Apr 27 12:41:42 2000  James C. Hu  <jxh@entera.com>
+
+        * ace/OS.i:
+        * ace/OS.cpp:
+        * ace/config-freebsd-pthread.h:
+        * ace/README:
+
+          Removed ACE_HAS_TIME_R in favor of using existing
+          mechanism of ACE_HAS_REENTRANT_FUNCTIONS, and then
+          adding ACE_LACKS_NETDB_REENTRANT_FUNCTIONS and
+          also ACE_LACKS_PWD_REENTRANT_FUNCTIONS.  Created a
+          new lacks called ACE_LACKS_RAND_REENTRANT_FUNCTIONS
+          to match the previous two.  FreeBSD can now use its
+          native *time_r functions.
+
 Thu Apr 27 10:55:11 2000  Darrell Brunsch <brunsch@uci.edu>
 
         These changes bring the Windows CE port up to date.  It currently
diff --git a/ace/OS.cpp b/ace/OS.cpp
index f3691c4aec1..053073646d7 100644
--- a/ace/OS.cpp
+++ b/ace/OS.cpp
@@ -4720,7 +4720,7 @@ struct tm *
 ACE_OS::localtime_r (const time_t *t, struct tm *res)
 {
   ACE_TRACE ("ACE_OS::localtime_r");
-#if defined (ACE_HAS_REENTRANT_FUNCTIONS) || defined (ACE_HAS_TIME_R)
+#if defined (ACE_HAS_REENTRANT_FUNCTIONS)
 # if defined (DIGITAL_UNIX)
   ACE_OSCALL_RETURN (::_Plocaltime_r (t, res), struct tm *, 0);
 # elif defined (HPUX_10)
diff --git a/ace/OS.i b/ace/OS.i
index 1d8b1f36991..7613a7b0575 100644
--- a/ace/OS.i
+++ b/ace/OS.i
@@ -762,7 +762,8 @@ ACE_INLINE int
 ACE_OS::rand_r (ACE_RANDR_TYPE &seed)
 {
   ACE_TRACE ("ACE_OS::rand_r");
-# if defined (ACE_HAS_REENTRANT_FUNCTIONS)
+# if defined (ACE_HAS_REENTRANT_FUNCTIONS) && \
+    !defined (ACE_LACKS_RAND_REENTRANT_FUNCTIONS)
 #   if defined (DIGITAL_UNIX)
   ACE_OSCALL_RETURN (::_Prand_r (&seed), int, -1);
 #   elif defined (HPUX_10)
@@ -9941,7 +9942,7 @@ ACE_INLINE ACE_TCHAR *
 ACE_OS::ctime_r (const time_t *t, ACE_TCHAR *buf, int buflen)
 {
   ACE_TRACE ("ACE_OS::ctime_r");
-# if defined (ACE_HAS_REENTRANT_FUNCTIONS) || defined (ACE_HAS_TIME_R)
+# if defined (ACE_HAS_REENTRANT_FUNCTIONS)
 #   if defined (ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R)
   ACE_TCHAR *result;
 #     if defined (DIGITAL_UNIX)
@@ -10012,7 +10013,7 @@ ACE_INLINE struct tm *
 ACE_OS::gmtime_r (const time_t *t, struct tm *res)
 {
   ACE_TRACE ("ACE_OS::localtime_r");
-#if defined (ACE_HAS_REENTRANT_FUNCTIONS) || defined (ACE_HAS_TIME_R)
+#if defined (ACE_HAS_REENTRANT_FUNCTIONS)
 # if defined (DIGITAL_UNIX)
   ACE_OSCALL_RETURN (::_Pgmtime_r (t, res), struct tm *, 0);
 # elif defined (HPUX_10)
@@ -10052,7 +10053,7 @@ ACE_INLINE char *
 ACE_OS::asctime_r (const struct tm *t, char *buf, int buflen)
 {
   ACE_TRACE ("ACE_OS::asctime_r");
-#if defined (ACE_HAS_REENTRANT_FUNCTIONS) || defined (ACE_HAS_TIME_R)
+#if defined (ACE_HAS_REENTRANT_FUNCTIONS)
 # if defined (ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R)
   char *result;
 #   if defined (DIGITAL_UNIX)
diff --git a/ace/README b/ace/README
index 0d317606cb5..b101fddf2dc 100644
--- a/ace/README
+++ b/ace/README
@@ -596,10 +596,6 @@ ACE_HAS_THR_C_DEST                      The pthread_keycreate()
 ACE_HAS_THR_C_FUNC                      The pthread_create() routine
                                         *must* take extern C
                                         functions.
-ACE_HAS_TIME_R                          Platform supports *time_r()
-                                        (e.g., gmtime_r()), but not
-                                        other reentrant APIs.  Compare
-                                        with ACE_HAS_REENTRANT_FUNCTIONS.
 ACE_HAS_TIMEZONE_GETTIMEOFDAY           Platform/compiler supports
                                         timezone * as second parameter
                                         to gettimeofday()
@@ -783,6 +779,7 @@ ACE_LACKS_PWD_REENTRANT_FUNCTIONS       Platform lacks getpwnam_r()
 ACE_LACKS_QSORT                         Compiler/platform lacks the
                                         standard C library qsort()
                                         function
+ACE_LACKS_RAND_REENTRANT_FUNCTIONS      Platform lacks rand_r()
 ACE_LACKS_READLINK                      Platform lacks the readlink() function.
 ACE_LACKS_READV                         Platform doesn't define readv,
                                         so use our own
diff --git a/ace/config-freebsd-pthread.h b/ace/config-freebsd-pthread.h
index 4d7c514a3b0..add350fb008 100644
--- a/ace/config-freebsd-pthread.h
+++ b/ace/config-freebsd-pthread.h
@@ -95,7 +95,10 @@ extern "C" { char * cuserid (char *s); }
 #endif /* __FreeBSD_version >= 300000 */
 
 #if (__FreeBSD_version >= 320000)
-#define ACE_HAS_TIME_R
+#define ACE_HAS_REENTRANT_FUNCTIONS
+#define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS
+#define ACE_LACKS_PWD_REENTRANT_FUNCTIONS
+#define ACE_LACKS_RAND_REENTRANT_FUNCTIONS
 #define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R
 #endif /* __FreeBSD_version >= 320000 */