ChangeLogTag: Thu Oct 29 13:58:25 UTC 2009 Olli Savia <ops@iki.fi>

4 files changed, 7 insertions, 25 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 030f8e8314c..34efb89256f 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,10 @@
+Thu Oct 29 13:58:25 UTC 2009  Olli Savia  <ops@iki.fi>
+
+        * ace/OS_NS_stdlib.h:
+        * ace/OS_NS_stdlib.inl:
+        * ace/OS_NS_time.h:
+          Removed some legacy undefs.
+
 Thu Oct 29 08:08:51 UTC 2009  Olli Savia  <ops@iki.fi>
 
         * ace/Log_Msg.cpp:
diff --git a/ACE/ace/OS_NS_stdlib.h b/ACE/ace/OS_NS_stdlib.h
index 62618c3695e..e9697119429 100644
--- a/ACE/ace/OS_NS_stdlib.h
+++ b/ACE/ace/OS_NS_stdlib.h
@@ -35,10 +35,6 @@
 #endif
 #define ACE_EXPORT_MACRO ACE_Export
 
-# if defined (ACE_HAS_BROKEN_R_ROUTINES)
-#   undef rand_r
-# endif /* ACE_HAS_BROKEN_R_ROUTINES */
-
 // We need this for MVS... as well as Linux, etc...
 // On Windows, we explicitly set this up as __cdecl so it's correct even
 // if building with another calling convention, such as __stdcall.
@@ -118,10 +114,6 @@ namespace ACE_OS {
 # endif /* ACE_HAS_WCHAR */
 
   // atop not in spec
-# if defined (atop)
-#   undef atop
-# endif /* atop */
-
   /*
    * Convert string to pointer
    */
diff --git a/ACE/ace/OS_NS_stdlib.inl b/ACE/ace/OS_NS_stdlib.inl
index bddd77a48f5..a70fff97db6 100644
--- a/ACE/ace/OS_NS_stdlib.inl
+++ b/ACE/ace/OS_NS_stdlib.inl
@@ -105,10 +105,6 @@ ACE_OS::atof (const wchar_t *s)
 }
 #endif /* ACE_HAS_WCHAR */
 
-#if defined (atop)
-#  undef atop
-#endif /* atop */
-
 ACE_INLINE void *
 ACE_OS::atop (const char *s)
 {
diff --git a/ACE/ace/OS_NS_time.h b/ACE/ace/OS_NS_time.h
index ca5d21ed736..c22e4d2f004 100644
--- a/ACE/ace/OS_NS_time.h
+++ b/ACE/ace/OS_NS_time.h
@@ -36,11 +36,6 @@
 #endif
 #define ACE_EXPORT_MACRO ACE_Export
 
-# if defined (ACE_HAS_BROKEN_R_ROUTINES)
-#   undef ctime_r
-#   undef asctime_r
-# endif /* ACE_HAS_BROKEN_R_ROUTINES */
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Type-safe, and unsigned.
@@ -196,10 +191,6 @@ namespace ACE_OS
 #endif
   ACE_TCHAR *ctime_r (const time_t *clock, ACE_TCHAR *buf, int buflen);
 
-# if defined (difftime)
-#   undef difftime
-# endif /* difftime */
-
 #if !defined (ACE_LACKS_DIFFTIME)
   ACE_NAMESPACE_INLINE_FUNCTION
 #else
@@ -268,10 +259,6 @@ namespace ACE_OS
   ACE_NAMESPACE_INLINE_FUNCTION
   time_t time (time_t *tloc = 0);
 
-# if defined (timezone)
-#   undef timezone
-# endif /* timezone */
-
   ACE_NAMESPACE_INLINE_FUNCTION
   long timezone (void);