Fri Oct 17 12:14:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>

11 files changed, 25 insertions, 602 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 338cf226b7d..e4e44b36d5b 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,17 @@
+Fri Oct 17 12:14:00 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/config-linux-common.h:
+        * ace/config-win32-borland.h:
+        * ace/Guard_T.h:
+        * ace/Handle_Set.cpp:
+        * ace/Monitor_Control_Types.h:
+        * ace/os_include/os_string.h:
+        * ace/os_include/os_unistd.h:
+        * ace/os_include/sys/os_timeb.h:
+        * ace/OS_NS_stdio.inl:
+        * ace/Truncate.h:
+          Removed BCB6/BCB2006 support
+
 Wed Oct 15 19:57:38 UTC 2008  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
 
         * ace/SSL/SSL_Context.cpp (report_error): Updated the code to use
@@ -9,7 +23,7 @@ Thu Oct 16 19:03:02 UTC 2008  Phil Mesnier  <mesnier_p@ociweb.com>
 
         * ace/Service_Config.inl:
         * ace/Service_Config.cpp:
-        
+
           Fix for Bug #3386. The argument parsing for the service
           configurator was separated into those that affect individual
           gestalts, and some process wide arguments. The process wide
@@ -22,15 +36,15 @@ Thu Oct 16 19:03:02 UTC 2008  Phil Mesnier  <mesnier_p@ociweb.com>
           guard against being evaluated more than once, so there should be
           no side effects of calling the SC::parse_args_i() more than
           once.
-        
+
           Thanks to Jack Lavender for reporting this problem.
 
         * examples/Service_Configurator/Misc/main.cpp:
-        
+
           Modified this test so that command line arguments passed in to
           main() are all added to the list supplied to
           service_config::open().
-        
+
         * THANKS:
           Updating contributors list.
 
diff --git a/ACE/ace/Guard_T.h b/ACE/ace/Guard_T.h
index 3c0870e1562..1780f8fd1bf 100644
--- a/ACE/ace/Guard_T.h
+++ b/ACE/ace/Guard_T.h
@@ -32,7 +32,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
  *
  * @brief This data structure is meant to be used within a method or
  * function...  It performs automatic aquisition and release of
- * a parameterized synchronization object <ACE_LOCK>.
+ * a parameterized synchronization object ACE_LOCK.
  *
  * The <ACE_LOCK> class given as an actual parameter must provide at
  * the very least the <acquire>, <tryacquire>, <release>, and
diff --git a/ACE/ace/Handle_Set.cpp b/ACE/ace/Handle_Set.cpp
index 05a85cb338a..6bf09c355ee 100644
--- a/ACE/ace/Handle_Set.cpp
+++ b/ACE/ace/Handle_Set.cpp
@@ -24,11 +24,6 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Handle_Set)
 #  define ACE_MSB_MASK (~((fd_mask) 1 << (NFDBITS - 1)))
 #endif /* ! ACE_WIN32 */
 
-#if defined (__BORLANDC__) && !defined (ACE_WIN32)
-// The Borland C++ compiler on Linux also doesn't have fds_bits, but has __fds_bits.
-#define fds_bits __fds_bits
-#endif
-
 #if defined (linux) && __GLIBC__ > 1 && __GLIBC_MINOR__ >= 1 && !defined (_XOPEN_SOURCE)
   // XPG4.2 requires the fds_bits member name, so it is not enabled by
   // default on Linux/glibc-2.1.x systems.  Instead use "__fds_bits."
diff --git a/ACE/ace/Monitor_Control_Types.h b/ACE/ace/Monitor_Control_Types.h
index b304363fcb2..792db456e5e 100644
--- a/ACE/ace/Monitor_Control_Types.h
+++ b/ACE/ace/Monitor_Control_Types.h
@@ -88,13 +88,6 @@ namespace ACE
         Control_Action* control_action;
       };
 
-#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x570)
-      // Borland C++ Builder 6 and earlier don't handle the second template
-      // argument correctly. We have to pass it explicitly
-      typedef ACE_Vector<Data, ACE_VECTOR_DEFAULT_SIZE> DataList;
-      typedef ACE_Vector<ACE_CString, ACE_VECTOR_DEFAULT_SIZE> NameList;
-      typedef ACE_Array_Map<long, Constraint, std::equal_to<long> > ConstraintList;
-#else
       /**
        * @brief Used by the admin class as a container for the data from
        *        a group of monitor points.
@@ -110,7 +103,6 @@ namespace ACE
        * @brief Holder for a monitor point's constraints.
        */
       typedef ACE_Array_Map<long, Constraint> ConstraintList;
-#endif
     };
   }
 }
diff --git a/ACE/ace/OS_NS_stdio.inl b/ACE/ace/OS_NS_stdio.inl
index 87d74dcb543..5a90c98aca4 100644
--- a/ACE/ace/OS_NS_stdio.inl
+++ b/ACE/ace/OS_NS_stdio.inl
@@ -511,15 +511,11 @@ ACE_OS::fdopen (ACE_HANDLE handle, const ACE_TCHAR *mode)
 
   if (crt_handle != -1)
     {
-#   if defined(ACE_HAS_NONCONST_FDOPEN) && !defined (ACE_USES_WCHAR)
-      file = ::_fdopen (crt_handle, const_cast<ACE_TCHAR *> (mode));
-#   elif defined (ACE_HAS_NONCONST_FDOPEN) && defined (ACE_USES_WCHAR)
-      file = ::_wfdopen (crt_handle, const_cast<ACE_TCHAR *> (mode));
-#   elif defined (ACE_USES_WCHAR)
+#   if defined (ACE_USES_WCHAR)
       file = ::_wfdopen (crt_handle, mode);
 #   else
       file = ::_fdopen (crt_handle, mode);
-#   endif /* ACE_HAS_NONCONST_FDOPEN */
+#   endif /* ACE_USES_WCHAR */
 
       if (!file)
         {
@@ -910,7 +906,7 @@ ACE_OS::tempnam (const wchar_t *dir, const wchar_t *pfx)
   ACE_OSCALL_RETURN (::_wtempnam (const_cast <wchar_t*> (dir), const_cast <wchar_t*> (pfx)), wchar_t *, 0);
 #  else
   ACE_OSCALL_RETURN (::_wtempnam (dir, pfx), wchar_t *, 0);
-#  endif /* __BORLANDC__ */
+#  endif /* ACE_HAS_NONCONST_TEMPNAM */
 #else /* ACE_LACKS_TEMPNAM */
   // No native wide-char support; convert to narrow and call the char* variant.
   char *ndir = ACE_Wide_To_Ascii (dir).char_rep ();
diff --git a/ACE/ace/Truncate.h b/ACE/ace/Truncate.h
index 1935bd6a80d..5e1bb7545da 100644
--- a/ACE/ace/Truncate.h
+++ b/ACE/ace/Truncate.h
@@ -27,18 +27,14 @@
 #include "ace/If_Then_Else.h"
 #include "ace/Numeric_Limits.h"
 
-#if defined (ACE_LACKS_LONGLONG_T) \
-    || defined (__BORLANDC__) && __BORLANDC__ < 0x590
+#if defined (ACE_LACKS_LONGLONG_T)
 # include "ace/Basic_Types.h"
-#endif  /* ACE_LACKS_LONGLONG_T || __BORLANDC__ < 0x590 */
+#endif  /* ACE_LACKS_LONGLONG_T */
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace ACE_Utils
 {
-
-#if !defined (__BORLANDC__) || __BORLANDC__ >= 0x590
-
   template<typename T> struct Sign_Check;
 
   // Specialize the unsigned signed cases.
@@ -512,540 +508,6 @@ namespace ACE_Utils
     return truncator() (val);
   }
 
-#else
-
-  // Borland can't handle the template meta-programming above so
-  // provide explicit specializations for a few types.  More will be
-  // added if necessary.
-
-  /**
-   * @deprecated Borland ACE_Utils::Truncator<> specializations should
-   *             be removed.
-   */
-
-  template<typename FROM, typename TO> struct Truncator;
-
-  //----------------------------------------------------------
-  // sizeof(FROM) >  sizeof(TO)
-  //----------------------------------------------------------
-
-  template<>
-  struct Truncator<ACE_INT32, ACE_INT8>
-  {
-    ACE_INT8 operator() (ACE_INT32 val)
-    {
-      return
-        (val > ACE_Numeric_Limits<ACE_INT8>::max ()
-         ? ACE_Numeric_Limits<ACE_INT8>::max ()
-         : static_cast<ACE_INT8> (val));
-    }
-  };
-
-  template<>
-  struct Truncator<ACE_UINT32, ACE_UINT8>
-  {
-    ACE_UINT8 operator() (ACE_UINT32 val)
-    {
-      return
-        (val > static_cast<ACE_UINT32> (ACE_Numeric_Limits<ACE_UINT8>::max ())
-         ? ACE_Numeric_Limits<ACE_UINT8>::max ()
-         : static_cast<ACE_UINT8> (val));
-    }
-  };
-
-  template<>
-  struct Truncator<ACE_INT32, ACE_UINT8>
-  {
-    ACE_UINT8 operator() (ACE_INT32 val)
-    {
-      return
-        (val > static_cast<ACE_INT32> (ACE_Numeric_Limits<ACE_UINT8>::max ())
-         ? ACE_Numeric_Limits<ACE_UINT8>::max ()
-         : static_cast<ACE_UINT8> (val));
-    }
-  };
-
-  template<>
-  struct Truncator<ACE_UINT32, ACE_INT8>
-  {
-    ACE_INT8 operator() (ACE_UINT32 val)
-    {
-      return
-        (val > static_cast<ACE_UINT32> (ACE_Numeric_Limits<ACE_INT8>::max ())
-         ? ACE_Numeric_Limits<ACE_INT8>::max ()
-         : static_cast<ACE_INT8> (val));
-    }
-  };
-
-#if defined (ACE_SIZEOF_LONG) && ACE_SIZEOF_LONG < 8
-  template<>
-  struct Truncator<ACE_INT64, signed long>
-  {
-    signed long operator() (ACE_INT64 val)
-    {
-      return
-        (val > ACE_Numeric_Limits<signed long>::max ()
-         ? ACE_Numeric_Limits<signed long>::max ()
-         : static_cast<signed long> (val));
-    }
-  };
-
-  template<>
-  struct Truncator<ACE_INT64, unsigned long>
-  {
-    unsigned long operator() (ACE_INT64 val)
-    {
-      return
-        (val > static_cast<ACE_INT64> (ACE_Numeric_Limits<unsigned long>::max ())
-         ? ACE_Numeric_Limits<unsigned long>::max ()
-         : static_cast<unsigned long> (val));
-    }
-  };
-
-  template<>
-  struct Truncator<ACE_UINT64, unsigned long>
-  {
-    unsigned long operator() (ACE_UINT64 val)
-    {
-      return
-        (val > static_cast<ACE_UINT64> (ACE_Numeric_Limits<unsigned long>::max ())
-         ? ACE_Numeric_Limits<unsigned long>::max ()
-         : static_cast<unsigned long> (val));
-    }
-  };
-
-  template<>
-  struct Truncator<ACE_UINT64, signed long>
-  {
-    signed long operator() (ACE_UINT64 val)
-    {
-      return
-        (val > static_cast<ACE_UINT64> (ACE_Numeric_Limits<signed long>::max ())
-         ? ACE_Numeric_Limits<signed long>::max ()
-         : static_cast<signed long> (val));
-    }
-  };
-
-  template<>
-  struct Truncator<const ACE_UINT64, signed long>
-  {
-    signed long operator() (const ACE_UINT64 val)
-    {
-      return
-        (val > static_cast<ACE_UINT64> (ACE_Numeric_Limits<signed long>::max ())
-         ? ACE_Numeric_Limits<signed long>::max ()
-         : static_cast<signed long> (val));
-    }
-  };
-
-#endif  /* ACE_SIZEOF_LONG < 8 */
-
-#if defined (ACE_SIZEOF_INT) && ACE_SIZEOF_INT < 8
-  template<>
-  struct Truncator<ACE_INT64, signed int>
-  {
-    ACE_INT32 operator() (ACE_INT64 val)
-    {
-      return
-        (val > ACE_Numeric_Limits<signed int>::max ()
-         ? ACE_Numeric_Limits<signed int>::max ()
-         : static_cast<signed int> (val));
-    }
-  };
-
-  template<>
-  struct Truncator<ACE_INT64, unsigned int>
-  {
-    ACE_UINT32 operator() (ACE_INT64 val)
-    {
-      return
-        (val > static_cast<ACE_INT64> (ACE_Numeric_Limits<unsigned int>::max ())
-         ? ACE_Numeric_Limits<unsigned int>::max ()
-         : static_cast<unsigned int> (val));
-    }
-  };
-
-  template<>
-  struct Truncator<ACE_UINT64, unsigned int>
-  {
-    ACE_UINT32 operator() (ACE_UINT64 val)
-    {
-      return
-        (val > static_cast<ACE_UINT64> (ACE_Numeric_Limits<unsigned int>::max ())
-         ? ACE_Numeric_Limits<unsigned int>::max ()
-         : static_cast<unsigned int> (val));
-    }
-  };
-
-  template<>
-  struct Truncator<ACE_UINT64, signed int>
-  {
-    signed int operator() (ACE_UINT64 val)
-    {
-      return
-        (val > static_cast<ACE_UINT64> (ACE_Numeric_Limits<signed int>::max ())
-         ? ACE_Numeric_Limits<signed int>::max ()
-         : static_cast<signed int> (val));
-    }
-  };
-
-#endif  /* ACE_SIZEOF_INT < 8 */
-
-  //----------------------------------------------------------
-  // sizeof(FROM) == sizeof(TO)
-  //----------------------------------------------------------
-
-  template<>
-  struct Truncator<unsigned int, char>
-  {
-    char operator() (unsigned int val)
-    {
-      return static_cast<char> (val);
-    }
-  };
-
-  template<>
-  struct Truncator<unsigned int, wchar_t>
-  {
-    wchar_t operator() (unsigned int val)
-    {
-      return static_cast<wchar_t> (val);
-    }
-  };
-
-  template<>
-  struct Truncator<signed int, unsigned int>
-  {
-    unsigned int operator() (signed int val)
-    {
-      return static_cast<unsigned int> (val);
-    }
-  };
-
-  template<>
-  struct Truncator<unsigned int, signed int>
-  {
-    signed int operator() (unsigned int val)
-    {
-      return
-        (val > static_cast<unsigned int> (ACE_Numeric_Limits<signed int>::max ())
-         ? ACE_Numeric_Limits<signed int>::max ()
-         : static_cast<signed int> (val));
-    }
-  };
-
-  template<>
-  struct Truncator<const unsigned int, signed int>
-  {
-    signed int operator() (const unsigned int val)
-    {
-      return
-        (val > static_cast<unsigned int> (ACE_Numeric_Limits<signed int>::max ())
-         ? ACE_Numeric_Limits<signed int>::max ()
-         : static_cast<signed int> (val));
-    }
-  };
-
-  template<>
-  struct Truncator<signed long, unsigned long>
-  {
-    unsigned long operator() (signed long val)
-    {
-      return static_cast<unsigned long> (val);
-    }
-  };
-
-  template<>
-  struct Truncator<unsigned long, signed long>
-  {
-    signed long operator() (unsigned long val)
-    {
-      return
-        (val > static_cast<unsigned long> (ACE_Numeric_Limits<signed long>::max ())
-         ? ACE_Numeric_Limits<signed long>::max ()
-         : static_cast<signed long> (val));
-    }
-  };
-
-#if defined (ACE_SIZEOF_INT) && defined (ACE_SIZEOF_LONG) \
-    && ACE_SIZEOF_INT == ACE_SIZEOF_LONG
-
-  template<>
-  struct Truncator<signed int, unsigned long>
-  {
-    unsigned long operator() (signed int val)
-    {
-      return static_cast<unsigned long> (val);
-    }
-  };
-
-  template<>
-  struct Truncator<signed int, signed long>
-  {
-    signed long operator() (signed int val)
-    {
-      return static_cast<signed long> (val);
-    }
-  };
-
-  template<>
-  struct Truncator<unsigned long, signed int>
-  {
-    signed int operator() (unsigned long val)
-    {
-      return
-        (val > static_cast<unsigned long> (ACE_Numeric_Limits<signed int>::max ())
-         ? ACE_Numeric_Limits<signed int>::max ()
-         : static_cast<signed int> (val));
-    }
-  };
-
-  template<>
-  struct Truncator<signed long, signed int>
-  {
-    signed int operator() (signed long val)
-    {
-      return static_cast<signed int> (val);
-//      This code causes asserts and compiler crashes with BCB6 Static and
-//      BCB2007 Static
-//      return
-//        (val > static_cast<signed long> (ACE_Numeric_Limits<signed int>::max ())
-//         ? ACE_Numeric_Limits<signed int>::max ()
-//         : static_cast<signed int> (val));
-    }
-  };
-
-  template<>
-  struct Truncator<signed long, unsigned int>
-  {
-    unsigned int operator() (signed long val)
-    {
-      return static_cast<unsigned int> (val);
-    }
-  };
-
-  template<>
-  struct Truncator<const signed long, unsigned int>
-  {
-    unsigned int operator() (const signed long val)
-    {
-      return static_cast<unsigned int> (val);
-    }
-  };
-
-
-  template<>
-  struct Truncator<unsigned int, signed long>
-  {
-    signed long operator() (unsigned int val)
-    {
-      return
-        (val > static_cast<unsigned int> (ACE_Numeric_Limits<signed long>::max ())
-         ? ACE_Numeric_Limits<signed long>::max ()
-         : static_cast<signed long> (val));
-    }
-  };
-
-#endif  /* ACE_SIZEOF_INT == ACE_SIZEOF_LONG */
-
-  template<>
-  struct Truncator<ACE_INT64, ACE_UINT64>
-  {
-    ACE_UINT64 operator() (ACE_INT64 val)
-    {
-      return static_cast<ACE_UINT64> (val);
-    }
-  };
-
-  template<>
-  struct Truncator<ACE_UINT64, ACE_INT64>
-  {
-    ACE_INT64 operator() (ACE_UINT64 val)
-    {
-      return
-        (val > static_cast<ACE_UINT64> (ACE_Numeric_Limits<ACE_INT64>::max ())
-         ? ACE_Numeric_Limits<ACE_INT64>::max ()
-         : static_cast<ACE_INT64> (val));
-    }
-  };
-
-  //----------------------------------------------------------
-  // sizeof(FROM) <  sizeof(TO)
-  //----------------------------------------------------------
-
-  template<>
-  struct Truncator<ACE_INT8, ACE_INT32>
-  {
-    ACE_INT32 operator() (ACE_INT8 val)
-    {
-      return static_cast<ACE_INT32> (val);
-    }
-  };
-
-  template<>
-  struct Truncator<ACE_UINT8, ACE_UINT32>
-  {
-    ACE_UINT32 operator() (ACE_UINT8 val)
-    {
-      return static_cast<ACE_UINT32> (val);
-    }
-  };
-
-  template<>
-  struct Truncator<ACE_UINT8, ACE_INT32>
-  {
-    ACE_INT32 operator() (ACE_UINT8 val)
-    {
-      return static_cast<ACE_INT32> (val);
-    }
-  };
-
-  template<>
-  struct Truncator<ACE_INT8, ACE_UINT32>
-  {
-    ACE_UINT32 operator() (ACE_INT8 val)
-    {
-      return static_cast<ACE_UINT32> (val);
-    }
-  };
-
-#if defined (ACE_SIZEOF_LONG) && ACE_SIZEOF_LONG < 8
-  template<>
-  struct Truncator<signed long, ACE_INT64>
-  {
-    ACE_INT64 operator() (signed long val)
-    {
-      return static_cast<ACE_INT64> (val);
-    }
-  };
-
-  template<>
-  struct Truncator<signed long, ACE_UINT64>
-  {
-    ACE_UINT64 operator() (signed long val)
-    {
-      return static_cast<ACE_UINT64> (val);
-    }
-  };
-
-  template<>
-  struct Truncator<const signed long, ACE_UINT64>
-  {
-    ACE_UINT64 operator() (const signed long val)
-    {
-      return
-        (val > static_cast<ACE_UINT64> (ACE_Numeric_Limits<signed long>::max ())
-         ? ACE_Numeric_Limits<signed long>::max ()
-         : static_cast<signed long> (val));
-    }
-  };
-
-  template<>
-  struct Truncator<unsigned long, ACE_UINT64>
-  {
-    ACE_UINT64 operator() (unsigned long val)
-    {
-      return static_cast<ACE_UINT64> (val);
-    }
-  };
-
-  template<>
-  struct Truncator<unsigned long, ACE_INT64>
-  {
-    ACE_INT64 operator() (unsigned long val)
-    {
-      return static_cast<ACE_INT64> (val);
-    }
-  };
-#endif  /* ACE_SIZEOF_LONG < 8 */
-
-#if defined (ACE_SIZEOF_INT) && ACE_SIZEOF_INT < 8
-  template<>
-  struct Truncator<signed int, ACE_INT64>
-  {
-    ACE_INT64 operator() (signed int val)
-    {
-      return static_cast<ACE_INT64> (val);
-    }
-  };
-
-  template<>
-  struct Truncator<signed int, ACE_UINT64>
-  {
-    ACE_UINT64 operator() (signed int val)
-    {
-      return static_cast<ACE_UINT64> (val);
-    }
-  };
-
-  template<>
-  struct Truncator<unsigned int, ACE_UINT64>
-  {
-    ACE_UINT64 operator() (unsigned int val)
-    {
-      return static_cast<ACE_UINT64> (val);
-    }
-  };
-
-  template<>
-  struct Truncator<unsigned int, ACE_INT64>
-  {
-    ACE_INT64 operator() (unsigned int val)
-    {
-      return static_cast<ACE_INT64> (val);
-    }
-  };
-#endif  /* ACE_SIZEOF_INT < 8 */
-
-  template<>
-  struct Truncator<size_t, unsigned long>
-  {
-    unsigned long operator() (size_t val)
-    {
-      return
-        (val > static_cast<unsigned long> (ACE_Numeric_Limits<size_t>::max ())
-         ? ACE_Numeric_Limits<size_t>::max ()
-         : static_cast<size_t> (val));
-    }
-  };
-
-  // Partial specialization for the case where the types are the same.
-  // No truncation is necessary.
-  template<typename T>
-  struct Truncator<T, T>
-  {
-    T operator() (T val)
-    {
-      return val;
-    }
-  };
-
-  // Partial specialization for the case where the types are the same,
-  // but the from type is const.  No truncation is necessary.
-  //
-  // This is only necessary to workaround a problem with the BCB6
-  // compiler.
-  template<typename T>
-  struct Truncator<T const, T>
-  {
-    T operator() (T val)
-    {
-      return val;
-    }
-  };
-
-  // -------------------------------------
-
-  template<typename TO, typename FROM>
-  inline TO truncate_cast (FROM val)
-  {
-    typedef Truncator<FROM, TO> truncator;
-
-    return truncator() (val);
-  }
-
-#endif  /* !__BORLANDC__ || __BORLANDC__ >= 0x590 */
-
 } // namespace ACE_Utils
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/config-linux-common.h b/ACE/ace/config-linux-common.h
index b93118d999d..fbc4ae3a0a6 100644
--- a/ACE/ace/config-linux-common.h
+++ b/ACE/ace/config-linux-common.h
@@ -174,12 +174,6 @@
 #elif defined (__DECCXX)
 # define ACE_CONFIG_INCLUDE_CXX_COMMON
 # include "ace/config-cxx-common.h"
-#elif defined (__BORLANDC__)
-# undef ACE_HAS_LLSEEK
-# undef ACE_HAS_LSEEK64
-# undef ACE_LACKS_LLSEEK_PROTOTYPE
-# undef ACE_LACKS_LSEEK64_PROTOTYPE
-# include "ace/config-borland-common.h"
 #elif defined (__SUNCC_PRO)
 # include "ace/config-suncc-common.h"
 #elif defined (__PGI)
@@ -199,7 +193,7 @@
  * (TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.{h,c}) that may indirectly
  * include this
  */
-#else  /* ! __GNUG__ && !__DECCXX && !__INTEL_COMPILER && !__BORLANDC__ && !__PGI */
+#else  /* ! __GNUG__ && !__DECCXX && !__INTEL_COMPILER && && !__PGI */
 #  ifdef __cplusplus  /* Let it slide for C compilers. */
 #    error unsupported compiler in ace/config-linux-common.h
 #  endif  /* __cplusplus */
diff --git a/ACE/ace/config-win32-borland.h b/ACE/ace/config-win32-borland.h
index fb7acde04e3..4621b5eb984 100644
--- a/ACE/ace/config-win32-borland.h
+++ b/ACE/ace/config-win32-borland.h
@@ -136,16 +136,6 @@
 # endif /* !_MT && !ACE_HAS_WINCE */
 #endif /* ACE_MT_SAFE && ACE_MT_SAFE != 0 */
 
-#if (__BORLANDC__ < 0x580)
-# define ACE_LACKS_INTPTR_T
-# define ACE_HAS_NONCONST_SWAB
-# define ACE_HAS_NONCONST_FDOPEN
-#endif
-
-# if (__BORLANDC__ < 0x590)
-#   define ACE_LACKS_PLACEMENT_OPERATOR_DELETE 1
-# endif
-
 #if (__BORLANDC__ < 0x610)
 # define ACE_HAS_NONCONST_TEMPNAM
 # define ACE_LACKS_STRTOLL
diff --git a/ACE/ace/os_include/os_string.h b/ACE/ace/os_include/os_string.h
index c2992a06d0e..7c7f63de930 100644
--- a/ACE/ace/os_include/os_string.h
+++ b/ACE/ace/os_include/os_string.h
@@ -63,11 +63,6 @@ extern "C"
   size_t strnlen(const char *s, size_t maxlen);
 #endif  /* ACE_LACKS_STRNLEN_PROTOTYPE */
 
-#if defined (__BORLANDC__) && (__BORLANDC__ < 0x560)
-#  define _stricmp stricmp
-#  define _strnicmp strnicmp
-#endif /* __BORLANDC__ */
-
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
diff --git a/ACE/ace/os_include/os_unistd.h b/ACE/ace/os_include/os_unistd.h
index 40c8e3f4097..29c9a39e405 100644
--- a/ACE/ace/os_include/os_unistd.h
+++ b/ACE/ace/os_include/os_unistd.h
@@ -27,10 +27,6 @@
 #include "ace/os_include/sys/os_types.h"
 #include "ace/os_include/os_inttypes.h"
 
-#if defined (__BORLANDC__)
-#  include "ace/os_include/os_fcntl.h"
-#endif /* __BORLANDC */
-
 #if defined (ACE_HAS_PROCESS_H)
 #  include /**/ <process.h>
 #endif /* ACE_HAS_PROCESS_H */
@@ -167,12 +163,6 @@ extern "C"
 #endif  /* _LARGEFILE64_SOURCE */
 
 #if defined (__BORLANDC__)
-#  if (__BORLANDC__ <= 0x540)
-#    define _getcwd getcwd
-#    define _chdir chdir
-#    undef _access
-#    define _access access
-#  endif
 #  define _isatty isatty
 #endif /* __BORLANDC__ */
 
diff --git a/ACE/ace/os_include/sys/os_timeb.h b/ACE/ace/os_include/sys/os_timeb.h
index 2495097d344..b52b232bac8 100644
--- a/ACE/ace/os_include/sys/os_timeb.h
+++ b/ACE/ace/os_include/sys/os_timeb.h
@@ -36,11 +36,6 @@ extern "C"
 {
 #endif /* __cplusplus */
 
-#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x560)
-#  define _ftime ftime
-#  define _timeb timeb
-#endif /* __BORLANDC__ */
-
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */