Thu Oct 29 21:45:30 UTC 2009 Olli Savia <ops@iki.fi>

9 files changed, 15 insertions, 74 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index da9430ca971..c44e1f00202 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,16 @@
+Thu Oct 29 21:45:30 UTC 2009  Olli Savia  <ops@iki.fi>
+
+        * ace/OS_NS_pwd.h:
+        * ace/OS_NS_time.inl:
+        * ace/README:
+        * ace/config-mvs.h:
+        * ace/config-tru64.h:
+        * ace/os_include/os_time.h:
+        * configure.ac:
+        * m4/config_h.m4:
+          Removed references to ACE_HAS_BROKEN_CTIME and 
+          ACE_HAS_BROKEN_R_ROUTINES.
+
 Thu Oct 29 21:25:49 UTC 2009  Chris Cleeland  <cleeland@ociweb.com>
 
         * tests/Message_Queue_Test.cpp:
diff --git a/ACE/ace/OS_NS_pwd.h b/ACE/ace/OS_NS_pwd.h
index 821582b449d..7e3bef0907d 100644
--- a/ACE/ace/OS_NS_pwd.h
+++ b/ACE/ace/OS_NS_pwd.h
@@ -33,10 +33,6 @@
 #endif
 #define ACE_EXPORT_MACRO ACE_Export
 
-# if defined (ACE_HAS_BROKEN_R_ROUTINES)
-#   undef getpwnam_r
-# endif /* ACE_HAS_BROKEN_R_ROUTINES */
-
 struct passwd;
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/OS_NS_time.inl b/ACE/ace/OS_NS_time.inl
index 9c7def18b5d..3fbbb3a7f98 100644
--- a/ACE/ace/OS_NS_time.inl
+++ b/ACE/ace/OS_NS_time.inl
@@ -97,9 +97,7 @@ ACE_INLINE ACE_TCHAR *
 ACE_OS::ctime (const time_t *t)
 {
   ACE_OS_TRACE ("ACE_OS::ctime");
-#if defined (ACE_HAS_BROKEN_CTIME)
-  ACE_OSCALL_RETURN (::asctime (::localtime (t)), char *, 0);
-#elif defined (ACE_HAS_WINCE)
+#if defined (ACE_HAS_WINCE)
   static ACE_TCHAR buf [ctime_buf_size];
   return ACE_OS::ctime_r (t,
                           buf,
@@ -124,7 +122,7 @@ ACE_OS::ctime (const time_t *t)
 #  else
   ACE_OSCALL_RETURN (::ctime (t), char *, 0);
 #  endif /* ACE_USES_WCHAR */
-# endif /* ACE_HAS_BROKEN_CTIME */
+# endif /* ACE_HAS_WINCE */
 }
 
 #if !defined (ACE_HAS_WINCE)  /* CE version in OS.cpp */
diff --git a/ACE/ace/README b/ACE/ace/README
index 02fac245d3f..4db871d9c7a 100644
--- a/ACE/ace/README
+++ b/ACE/ace/README
@@ -247,8 +247,6 @@ ACE_HAS_BROKEN_ACCEPT_ADDR              Platform can't correctly deal
                                         (e.g, VxWorks).
 ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS Compiler can't handle const char *
                                         as rvalue in conditional operator.
-ACE_HAS_BROKEN_CTIME                    Compiler/platform uses macro
-                                        for ctime (e.g., MVS)
 ACE_HAS_BROKEN_DGRAM_SENDV              Platform sendv() does not work
                                         properly with datagrams,
                                         i.e. it fails when the iovec
diff --git a/ACE/ace/config-mvs.h b/ACE/ace/config-mvs.h
index 719d30dcc46..739d984fbd8 100644
--- a/ACE/ace/config-mvs.h
+++ b/ACE/ace/config-mvs.h
@@ -42,7 +42,6 @@
 #define ERRMAX __sys_nerr
 
 #define ACE_HAS_3_PARAM_WCSTOK
-#define ACE_HAS_BROKEN_CTIME
 #define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES
 #define ACE_HAS_CPLUSPLUS_HEADERS
 #define ACE_HAS_DIRENT
diff --git a/ACE/ace/config-tru64.h b/ACE/ace/config-tru64.h
index 8f4fb828dcf..4d083ad0616 100644
--- a/ACE/ace/config-tru64.h
+++ b/ACE/ace/config-tru64.h
@@ -59,7 +59,6 @@
 
 #define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R
 #define ACE_HAS_BROKEN_IF_HEADER
-#define ACE_HAS_BROKEN_R_ROUTINES
 #if (ACE_MT_SAFE != 0)
 # define ACE_HAS_PTHREADS
 # define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS
diff --git a/ACE/ace/os_include/os_time.h b/ACE/ace/os_include/os_time.h
index 6d03b2f6e82..c86916e9b70 100644
--- a/ACE/ace/os_include/os_time.h
+++ b/ACE/ace/os_include/os_time.h
@@ -81,10 +81,6 @@ extern "C"
 {
 #endif /* __cplusplus */
 
-#if defined (ACE_HAS_BROKEN_CTIME)
-#  undef ctime
-#endif /* ACE_HAS_BROKEN_CTIME */
-
 // There are a lot of threads-related macro definitions in the config files.
 // They came in at different times and from different places and platform
 // requirements as threads evolved.  They are probably not all needed - some
diff --git a/ACE/configure.ac b/ACE/configure.ac
index 469e6412cca..a97b2bd3c8e 100644
--- a/ACE/configure.ac
+++ b/ACE/configure.ac
@@ -5931,58 +5931,6 @@ dnl
 dnl SECTION 13: checks for system services
 dnl
 
-dnl Check if platform defines ctime() as a macro
-ACE_CACHE_CHECK([for ctime() macro],
-  [ace_cv_feature_have_ctime_macro],
-  [
-   AC_EGREP_CPP([ACE_CTIME_MACRO],
-     [
-#include <time.h>
-
-#if defined (ctime)
-  ACE_CTIME_MACRO
-#endif
-     ],
-     [
-      ace_cv_feature_have_ctime_macro=yes
-     ],
-     [
-      ace_cv_feature_have_ctime_macro=no
-     ])
-  ], [AC_DEFINE([ACE_HAS_BROKEN_CTIME])],)
-
-dnl Check if platform defines ctime_r, asctime_r, rand_r or getpwnam_r
-dnl as macros.
-ACE_CACHE_CHECK([for reentrant function macros],
-  [ace_cv_feature_has_broken_r_routines],
-  [
-   AC_EGREP_CPP([ACE_R_MACROS],
-     [
-#ifndef _REENTRANT
-# define _REENTRANT
-#endif
-
-#include <time.h>
-
-#if !defined (ACE_LACKS_PWD_H)
-# include <pwd.h>
-#endif
-
-#if defined (ctime_r) || \
-    defined (asctime_r) || \
-    defined (rand_r) || \
-    defined (getpwnam_r)
-  ACE_R_MACROS
-#endif
-     ],
-     [
-      ace_cv_feature_has_broken_r_routines=yes
-     ],
-     [
-      ace_cv_feature_has_broken_r_routines=no
-     ])
-  ], [AC_DEFINE([ACE_HAS_BROKEN_R_ROUTINES])],)
-
 dnl Check for open() mode masks
 ACE_CACHE_CHECK([for open() mode masks],
   [ace_cv_feature_have_open_mode_masks],[
diff --git a/ACE/m4/config_h.m4 b/ACE/m4/config_h.m4
index 56378738340..bf904f977a0 100644
--- a/ACE/m4/config_h.m4
+++ b/ACE/m4/config_h.m4
@@ -262,9 +262,6 @@ AH_TEMPLATE([ACE_EXPLICIT_TEMPLATE_DESTRUCTOR_TAKES_ARGS],
 AH_TEMPLATE([ACE_HAS_BROKEN_MAP_FAILED],
 [Platform doesn't cast MAP_FAILED to a (void *).])
 
-AH_TEMPLATE([ACE_HAS_BROKEN_CTIME],
-[Compiler/platform uses macro for ctime (e.g., MVS)])
-
 AH_TEMPLATE([ACE_HAS_BROKEN_DGRAM_SENDV],
 [Platform sendv() does not work properly with datagrams, i.e. it
 fails when the iovec size is IOV_MAX.])
@@ -278,9 +275,6 @@ AH_TEMPLATE([ACE_HAS_BROKEN_MMAP_H],
 AH_TEMPLATE([ACE_HAS_BROKEN_POSIX_TIME],
 [Platform defines struct timespec in <sys/timers.h>])
 
-AH_TEMPLATE([ACE_HAS_BROKEN_R_ROUTINES],
-[Platform defines ctime_r, asctime_r, rand_r and getpwnam_r as macros])
-
 AH_TEMPLATE([ACE_HAS_BROKEN_RANDR],
 [OS/compiler's header files are inconsistent with libC definition of
 rand_r().])