Thu Mar 22 19:38:02 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

15 files changed, 17 insertions, 247 deletions

diff --git a/ACE/ace/Basic_Types.h b/ACE/ace/Basic_Types.h
index 36737a480ad..8c90cd9b881 100644
--- a/ACE/ace/Basic_Types.h
+++ b/ACE/ace/Basic_Types.h
@@ -686,16 +686,13 @@ ACE_END_VERSIONED_NAMESPACE_DECL
       // some compilers happy until we have better support
 #   define ACE_INT64_LITERAL(n) n ## L
 # elif defined (ACE_WIN32)
-#  if defined (__IBMCPP__) && (__IBMCPP__ >= 400)
-#   define ACE_UINT64_LITERAL(n) n ## LL
-#   define ACE_INT64_LITERAL(n) n ## LL
-#  elif defined (__MINGW32__)
+#  if defined (__MINGW32__)
 #   define ACE_UINT64_LITERAL(n) n ## ull
 #   define ACE_INT64_LITERAL(n) n ## ll
 #  else
 #   define ACE_UINT64_LITERAL(n) n ## ui64
 #   define ACE_INT64_LITERAL(n) n ## i64
-#  endif /* defined (__IBMCPP__) && (__IBMCPP__ >= 400) */
+#  endif /* defined (__MINGW32__) */
 # elif defined (__TANDEM)
 #   define ACE_UINT64_LITERAL(n) n ## LL
 #   define ACE_INT64_LITERAL(n) n ## LL
diff --git a/ACE/ace/Condition_Thread_Mutex.cpp b/ACE/ace/Condition_Thread_Mutex.cpp
index d7aa83f9b6f..9f341090567 100644
--- a/ACE/ace/Condition_Thread_Mutex.cpp
+++ b/ACE/ace/Condition_Thread_Mutex.cpp
@@ -46,7 +46,7 @@ ACE_Condition_Thread_Mutex::ACE_Condition_Thread_Mutex (const ACE_Thread_Mutex &
                                                         const ACE_TCHAR *name,
                                                         void *arg)
   : mutex_ ((ACE_Thread_Mutex &) m),
-    removed_ (0)
+    removed_ (false)
 {
 // ACE_TRACE ("ACE_Condition_Thread_Mutex::ACE_Condition_Thread_Mutex");
   if (ACE_OS::cond_init (&this->cond_,
@@ -64,7 +64,7 @@ ACE_Condition_Thread_Mutex (const ACE_Thread_Mutex &m,
                             const ACE_TCHAR *name,
                             void *arg)
   : mutex_ ((ACE_Thread_Mutex &) m),
-    removed_ (0)
+    removed_ (false)
 {
 // ACE_TRACE ("ACE_Condition_Thread_Mutex::ACE_Condition_Thread_Mutex");
   if (ACE_OS::cond_init (&this->cond_, attributes.attributes_,
diff --git a/ACE/ace/Condition_Thread_Mutex.h b/ACE/ace/Condition_Thread_Mutex.h
index b1fd4cb6ecf..fad2df9cb76 100644
--- a/ACE/ace/Condition_Thread_Mutex.h
+++ b/ACE/ace/Condition_Thread_Mutex.h
@@ -100,7 +100,7 @@ public:
 
   /**
    * Block on condition, or until absolute time-of-day has passed.  If
-   * abstime == 0 use "blocking" <wait> semantics.  Else, if <abstime>
+   * abstime == 0 use "blocking" <wait> semantics.  Else, if @a abstime
    * != 0 and the call times out before the condition is signaled
    * <wait> returns -1 and sets errno to ETIME.
    */
@@ -113,7 +113,7 @@ public:
    * Block on condition or until absolute time-of-day has passed.  If
    * abstime == 0 use "blocking" wait() semantics on the <mutex>
    * passed as a parameter (this is useful if you need to store the
-   * <Condition> in shared memory).  Else, if <abstime> != 0 and the
+   * <Condition> in shared memory).  Else, if @a abstime != 0 and the
    * call times out before the condition is signaled <wait> returns -1
    * and sets errno to ETIME.
    */
@@ -146,7 +146,7 @@ protected:
   /// destructor.  This flag isn't protected by a lock, so make sure
   /// that you don't have multiple threads simultaneously calling
   /// <remove> on the same object, which is a bad idea anyway...
-  int removed_;
+  bool removed_;
 
 private:
   // = Prevent assignment and initialization.
diff --git a/ACE/ace/Condition_Thread_Mutex.inl b/ACE/ace/Condition_Thread_Mutex.inl
index 3e12c9c911a..12cc18a1bad 100644
--- a/ACE/ace/Condition_Thread_Mutex.inl
+++ b/ACE/ace/Condition_Thread_Mutex.inl
@@ -29,9 +29,9 @@ ACE_Condition_Thread_Mutex::remove (void)
 
   int result = 0;
 
-  if (this->removed_ == 0)
+  if (!this->removed_)
     {
-      this->removed_ = 1;
+      this->removed_ = true;
 
       while ((result = ACE_OS::cond_destroy (&this->cond_)) == -1
              && errno == EBUSY)
diff --git a/ACE/ace/Global_Macros.h b/ACE/ace/Global_Macros.h
index dace42b36c3..97b7947d51e 100644
--- a/ACE/ace/Global_Macros.h
+++ b/ACE/ace/Global_Macros.h
@@ -922,10 +922,6 @@ ACE_MAKE_SVC_CONFIG_FACTORY_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (AC
 #     define ACE_SEH_TRY try
 #     define ACE_SEH_EXCEPT(X) __except(X)
 #     define ACE_SEH_FINALLY __finally
-#   elif defined (__IBMCPP__) && (__IBMCPP__ >= 400)
-#     define ACE_SEH_TRY if (1)
-#     define ACE_SEH_EXCEPT(X) while (0)
-#     define ACE_SEH_FINALLY if (1)
 #   else
 #     define ACE_SEH_TRY __try
 #     define ACE_SEH_EXCEPT(X) __except(X)
diff --git a/ACE/ace/OS_NS_Thread.cpp b/ACE/ace/OS_NS_Thread.cpp
index bf5711d9f33..fb9c440a029 100644
--- a/ACE/ace/OS_NS_Thread.cpp
+++ b/ACE/ace/OS_NS_Thread.cpp
@@ -33,46 +33,6 @@ ACE_MUTEX_LOCK_CLEANUP_ADAPTER_NAME (void *args)
 #if !defined(ACE_WIN32) && defined (__IBMCPP__) && (__IBMCPP__ >= 400)
 # define ACE_BEGINTHREADEX(STACK, STACKSIZE, ENTRY_POINT, ARGS, FLAGS, THR_ID) \
        (*THR_ID = ::_beginthreadex ((void(_Optlink*)(void*))ENTRY_POINT, STACK, STACKSIZE, ARGS), *THR_ID)
-#elif defined(ACE_WIN32) && defined (__IBMCPP__) && (__IBMCPP__ >= 400)
-
-struct __IBMCPP__thread_params {
-  __IBMCPP__thread_params(ACE_THR_C_FUNC e, LPVOID a)
-    :entry_point(e),args(a) {}
-  ACE_THR_C_FUNC entry_point;
-  LPVOID args;
-};
-
-# pragma handler(initThread)
-extern "C" DWORD __stdcall __IBMCPP__initThread(void *arg)
-{
-  // Must reset 387 since using CreateThread
-  _fpreset();
-
-  // Dispatch user function...
-  auto_ptr<__IBMCPP__thread_params> parms((__IBMCPP__thread_params *)arg);
-  (*parms->entry_point)(parms->args);
-  _endthread();
-  return 0;
-}
-
-HANDLE WINAPI __IBMCPP__beginthreadex(void *stack,
-                                      DWORD stacksize,
-                                      ACE_THR_C_FUNC entry_point,
-                                      LPVOID args,
-                                      DWORD flags,
-                                      LPDWORD thr_id)
-{
-  return  CreateThread(0,
-                       stacksize,
-                       (LPTHREAD_START_ROUTINE)__IBMCPP__initThread,
-                       new __IBMCPP__thread_params(entry_point, args),
-                       flags,
-                       thr_id);
-}
-
-# define ACE_BEGINTHREADEX(STACK, STACKSIZE, ENTRY_POINT, ARGS, FLAGS, THR_ID) \
-             __IBMCPP__beginthreadex(STACK, STACKSIZE, ENTRY_POINT, ARGS, FLAGS, THR_ID)
-
 #elif defined (ACE_HAS_WINCE) && defined (UNDER_CE) && (UNDER_CE >= 211)
 # define ACE_BEGINTHREADEX(STACK, STACKSIZE, ENTRY_POINT, ARGS, FLAGS, THR_ID) \
       CreateThread (0, STACKSIZE, (unsigned long (__stdcall *) (void *)) ENTRY_POINT, ARGS, (FLAGS) & CREATE_SUSPENDED, (unsigned long *) THR_ID)
diff --git a/ACE/ace/OS_NS_errno.inl b/ACE/ace/OS_NS_errno.inl
index b8d82f3fd24..9e8ce9e7bc2 100644
--- a/ACE/ace/OS_NS_errno.inl
+++ b/ACE/ace/OS_NS_errno.inl
@@ -39,16 +39,7 @@ ACE_INLINE int
 ACE_OS::set_errno_to_last_error (void)
 {
 # if defined (ACE_WIN32)
-// Borland C++ Builder 4 has a bug in the RTL that resets the
-// <GetLastError> value to zero when errno is accessed.  Thus, we have
-// to use this to set errno to GetLastError.  It's bad, but only for
-// WIN32.
-#   if defined(__BORLANDC__) && (__BORLANDC__ == 0x540) || defined (__IBMCPP__) && (__IBMCPP__ >= 400)
-  int last_error = ::GetLastError ();
-  return errno = last_error;
-#   else /* defined(__BORLANDC__) && (__BORLANDC__ == 0x540) */
   return errno = ::GetLastError ();
-#   endif /* defined(__BORLANDC__) && (__BORLANDC__ == 0x540) */
 #else
   return errno;
 # endif /* defined(ACE_WIN32) */
@@ -58,16 +49,7 @@ ACE_INLINE int
 ACE_OS::set_errno_to_wsa_last_error (void)
 {
 # if defined (ACE_WIN32)
-// Borland C++ Builder 4 has a bug in the RTL that resets the
-// <GetLastError> value to zero when errno is accessed.  Thus, we have
-// to use this to set errno to GetLastError.  It's bad, but only for
-// WIN32
-#   if defined(__BORLANDC__) && (__BORLANDC__ == 0x540) || defined (__IBMCPP__) && (__IBMCPP__ >= 400)
-  int last_error = ::WSAGetLastError ();
-  return errno = last_error;
-#   else /* defined(__BORLANDC__) && (__BORLANDC__ == 0x540) */
   return errno = ::WSAGetLastError ();
-#   endif /* defined(__BORLANDC__) && (__BORLANDC__ == 0x540) */
 #else
   return errno;
 # endif /* defined(ACE_WIN32) */
diff --git a/ACE/ace/OS_NS_sys_stat.h b/ACE/ace/OS_NS_sys_stat.h
index 8ca35970412..bfda63f45fb 100644
--- a/ACE/ace/OS_NS_sys_stat.h
+++ b/ACE/ace/OS_NS_sys_stat.h
@@ -42,7 +42,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 typedef struct stati64 ACE_stat;
 #       define ACE_STAT_FUNC_NAME ::_stati64
 #       define ACE_WSTAT_FUNC_NAME ::_wstati64
-#   elif !defined (ACE_HAS_WINCE) && !defined(__IBMCPP__) && defined (_MSC_VER)
+#   elif !defined (ACE_HAS_WINCE) && defined (_MSC_VER)
 #     if _MSC_VER >= 1400
 //      For vc8 which has time_t as 64bit
 //      64-bit file offsets, 64-bit time_t
@@ -62,9 +62,7 @@ typedef struct stat ACE_stat;
 #   endif  /**/
 # else
 //  Default file offset case.
-#   if defined (ACE_WIN32) \
-       && !defined (ACE_HAS_WINCE) \
-       && !defined(__IBMCPP__)
+#   if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)
 typedef struct _stat ACE_stat;
 #     define ACE_STAT_FUNC_NAME ::_stat
 #     define ACE_WSTAT_FUNC_NAME ::_wstat
diff --git a/ACE/ace/OS_NS_sys_stat.inl b/ACE/ace/OS_NS_sys_stat.inl
index b8757e5bb8b..ed4fa478181 100644
--- a/ACE/ace/OS_NS_sys_stat.inl
+++ b/ACE/ace/OS_NS_sys_stat.inl
@@ -166,10 +166,7 @@ namespace ACE_OS
   ACE_INLINE int
   mkdir (const char *path, mode_t mode)
   {
-#if defined (ACE_WIN32) && defined (__IBMCPP__) && (__IBMCPP__ >= 400)
-    ACE_UNUSED_ARG (mode);
-    ACE_OSCALL_RETURN (::_mkdir (const_cast <char *> (path)), int, -1);
-#elif defined (ACE_HAS_WINCE)
+#if defined (ACE_HAS_WINCE)
     ACE_UNUSED_ARG (mode);
     ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::CreateDirectory (ACE_TEXT_CHAR_TO_TCHAR (path), 0),
                                             ace_result_),
diff --git a/ACE/ace/OS_NS_unistd.inl b/ACE/ace/OS_NS_unistd.inl
index 53468306746..eabc65e4f00 100644
--- a/ACE/ace/OS_NS_unistd.inl
+++ b/ACE/ace/OS_NS_unistd.inl
@@ -124,17 +124,11 @@ ACE_OS::chdir (const char *path)
   ACE_OS_TRACE ("ACE_OS::chdir");
 #if defined (ACE_HAS_NONCONST_CHDIR)
   ACE_OSCALL_RETURN (::chdir (const_cast<char *> (path)), int, -1);
-
-#elif defined (ACE_WIN32) && defined (__IBMCPP__) && (__IBMCPP__ >= 400)
-  ACE_OSCALL_RETURN (::_chdir (const_cast<char *> (path)), int, -1);
-
 #elif defined (ACE_HAS_WINCE)
   ACE_UNUSED_ARG (path);
   ACE_NOTSUP_RETURN (-1);
-
 #else
   ACE_OSCALL_RETURN (::chdir (path), int, -1);
-
 #endif /* ACE_HAS_NONCONST_CHDIR */
 }
 
@@ -154,9 +148,7 @@ ACE_OS::chdir (const wchar_t *path)
 ACE_INLINE int
 ACE_OS::rmdir (const char *path)
 {
-#if defined (ACE_WIN32) && defined (__IBMCPP__) && (__IBMCPP__ >= 400)
-  ACE_OSCALL_RETURN (::_rmdir ((char *) path), int, -1);
-#elif defined (ACE_HAS_WINCE)
+#if defined (ACE_HAS_WINCE)
   ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::RemoveDirectory (ACE_TEXT_CHAR_TO_TCHAR (path)),
                                           ace_result_),
                         int, -1);
diff --git a/ACE/ace/Task.cpp b/ACE/ace/Task.cpp
index ce16da60754..5bb740da456 100644
--- a/ACE/ace/Task.cpp
+++ b/ACE/ace/Task.cpp
@@ -270,12 +270,12 @@ ACE_Task_Base::svc_run (void *args)
   // Call the Task's svc() hook method.
   int svc_status = t->svc ();
   ACE_THR_FUNC_RETURN status;
-#if (defined (__BORLANDC__) && (__BORLANDC__ < 0x600)) || defined (__MINGW32__) || (defined (_MSC_VER) && (_MSC_VER <= 1400)) || (defined (ACE_WIN32) && (defined(__IBMCPP__) || defined (__DCC__)))
+#if (defined (__BORLANDC__) && (__BORLANDC__ < 0x600)) || defined (__MINGW32__) || (defined (_MSC_VER) && (_MSC_VER <= 1400)) || (defined (ACE_WIN32) && defined (__DCC__))
   // Some compilers complain about reinterpret_cast from int to unsigned long...
   status = static_cast<ACE_THR_FUNC_RETURN> (svc_status);
 #else
   status = reinterpret_cast<ACE_THR_FUNC_RETURN> (svc_status);
-#endif /* (__BORLANDC__ < 0x600) || __MINGW32__ || _MSC_VER <= 1400 || __IBMCPP__ */
+#endif /* (__BORLANDC__ < 0x600) || __MINGW32__ || _MSC_VER <= 1400 */
 
 // If we changed this zero change the other if in OS.cpp Thread_Adapter::invoke
 #if 1
diff --git a/ACE/ace/Timer_Heap_T.cpp b/ACE/ace/Timer_Heap_T.cpp
index de2926362f8..9570380d145 100644
--- a/ACE/ace/Timer_Heap_T.cpp
+++ b/ACE/ace/Timer_Heap_T.cpp
@@ -190,13 +190,8 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::ACE_Timer_Heap_T (FUNCTOR *upcall_fun
 #endif /* ACE_LACKS_NUMERIC_LIMITS */
 
   // Create the heap array.
-#if defined (__IBMCPP__) && (__IBMCPP__ >= 400) && defined (_WINDOWS)
-    ACE_NEW (this->heap_,
-             ACE_Timer_Node_T<TYPE> *[ACE_DEFAULT_TIMERS]);
-#else
     ACE_NEW (this->heap_,
              ACE_Timer_Node_T<TYPE> *[this->max_size_]);
-#endif /* defined (__IBMCPP__) && (__IBMCPP__ >= 400) && defined (_WINDOWS) */
 
   // Create the parallel array.
   ACE_NEW (this->timer_ids_,
@@ -542,13 +537,9 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::grow_heap (void)
 
   ACE_Timer_Node_T<TYPE> **new_heap = 0;
 
-#if defined (__IBMCPP__) && (__IBMCPP__ >= 400) && defined (_WINDOWS)
-  ACE_NEW (new_heap,
-           ACE_Timer_Node_T<TYPE> *[1024]);
-#else
   ACE_NEW (new_heap,
            ACE_Timer_Node_T<TYPE> *[new_size]);
-#endif /* defined (__IBMCPP__) && (__IBMCPP__ >= 400) && defined (_WINDOWS) */
+
   ACE_OS::memcpy (new_heap,
                   this->heap_,
                   this->max_size_ * sizeof *new_heap);
@@ -578,13 +569,8 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::grow_heap (void)
     {
       // Create a new array with max_size elements to link in to
       // existing list.
-#if defined (__IBMCPP__) && (__IBMCPP__ >= 400) && defined (_WINDOWS)
-      ACE_NEW (this->preallocated_nodes_,
-               ACE_Timer_Node_T<TYPE>[88]);
-#else
       ACE_NEW (this->preallocated_nodes_,
                ACE_Timer_Node_T<TYPE>[this->max_size_]);
-#endif /* defined (__IBMCPP__) && (__IBMCPP__ >= 400) && defined (_WINDOWS) */
 
       // Add it to the set for later deletion
       this->preallocated_node_set_.insert (this->preallocated_nodes_);
diff --git a/ACE/ace/config-win32-common.h b/ACE/ace/config-win32-common.h
index 5a8e52d44bc..8f222bfe070 100644
--- a/ACE/ace/config-win32-common.h
+++ b/ACE/ace/config-win32-common.h
@@ -103,7 +103,7 @@
 //  #endif
 
 // Define the special export macros needed to export symbols outside a dll
-#if !defined(__BORLANDC__) && !defined(__IBMCPP__)
+#if !defined(__BORLANDC__)
 #define ACE_HAS_CUSTOM_EXPORT_MACROS
 #define ACE_Proper_Export_Flag __declspec (dllexport)
 #define ACE_Proper_Import_Flag __declspec (dllimport)
diff --git a/ACE/ace/config-win32-visualage.h b/ACE/ace/config-win32-visualage.h
deleted file mode 100644
index 2bd490d74eb..00000000000
--- a/ACE/ace/config-win32-visualage.h
+++ /dev/null
@@ -1,136 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file   config-win32-visualage.h
- *
- *  $Id$
- *
- *  @brief  Configuration file for VisualAge compilers
- *
- *  @note   Do not include this file directly, include config-win32.h instead.
- *
- *  @author Darrell Brunsch <brunsch@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef ACE_CONFIG_WIN32_VISUALAGE_H
-#define ACE_CONFIG_WIN32_VISUALAGE_H
-#include /**/ "ace/pre.h"
-
-#ifndef ACE_CONFIG_WIN32_H
-#error Use config-win32.h in config.h instead of this header
-#endif /* ACE_CONFIG_WIN32_H */
-
-#if defined (__IBMCPP__) && (__IBMCPP__ >= 400)
-
-#define ACE_CC_NAME ACE_LIB_TEXT ("IBM VisualAge C++")
-#define ACE_CC_MAJOR_VERSION (__IBMCPP__ / 0x100)
-#define ACE_CC_MINOR_VERSION (__IBMCPP__ % 0x100)
-#define ACE_CC_BETA_VERSION (0)
-#define ACE_CC_PREPROCESSOR ""
-#define ACE_CC_PREPROCESSOR_ARGS ""
-
-#define ACE_HAS_CUSTOM_EXPORT_MACROS
-#define ACE_Proper_Export_Flag __declspec (dllexport)
-#define ACE_Proper_Import_Flag __declspec (dllimport)
-#define ACE_EXPORT_SINGLETON_DECLARATION(T) template class  T
-#define ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) template class __declspec (dllexport) SINGLETON_TYPE<CLASS, LOCK>;
-#define ACE_IMPORT_SINGLETON_DECLARATION(T) template class T
-#define ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) template class SINGLETON_TYPE <CLASS, LOCK>;
-
-// By default WIN32 has FD_SETSIZE of 64, which places the limit
-// between 61 and 64 on the number of clients a server using the
-// Select Reactor can support at the same time (i.e., 64 - standard in,
-// out, error).  He we raise the limit to 1024.  Adjust the definition
-// below if you need to raise or lower it.
-//
-#define FD_SETSIZE 1024
-
-//These need to be defined for VisualAgeC++
-#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES /* For signal handling */
-#define ACE_LACKS_MKTEMP
-#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES
-#define NSIG 23 /* Maximum no. of signals + 1 */
-#define ACE_HAS_CPLUSPLUS_HEADERS 1
-#define ACE_HAS_EXCEPTIONS 1
-#define ACE_HAS_GNU_CSTRING_H 1
-#define ACE_HAS_NONCONST_SELECT_TIMEVAL 1
-#define ACE_HAS_SIG_ATOMIC_T 1
-#define ACE_HAS_STANDARD_CPP_LIBRARY 1
-#define ACE_HAS_STDCPP_STL_INCLUDES 1
-#define ACE_HAS_STRERROR 1
-#define ACE_HAS_STRING_CLASS 1
-#define ACE_HAS_TEMPLATE_SPECIALIZATION 1
-#define ACE_HAS_TEMPLATE_TYPEDEFS 1
-#define ACE_LACKS_ACE_IOSTREAM 1
-#define ACE_LACKS_LINEBUFFERED_STREAMBUF 1
-#define ACE_LACKS_STRPTIME 1
-#define ACE_LACKS_PRAGMA_ONCE 1
-#define ACE_LACKS_STRRECVFD 1
-#define ACE_NEW_THROWS_EXCEPTIONS 1
-#define ACE_SIZEOF_LONG_DOUBLE 10
-#define ACE_TEMPLATES_REQUIRE_SOURCE 1
-#define ACE_EXPLICIT_TEMPLATE_DESTRUCTOR_TAKES_ARGS 1
-#define ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%I64u")
-#define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1
-
-#define ACE_LACKS_NET_IF_H
-#define ACE_LACKS_NETINET_IN_H
-#define ACE_LACKS_DIRENT_H
-#define ACE_LACKS_DLFCN_H
-#define ACE_LACKS_NETDB_H
-#define ACE_LACKS_PWD_H
-#define ACE_LACKS_SEMAPHORE_H
-#define ACE_LACKS_STDINT_H
-#define ACE_LACKS_STRINGS_H
-#define ACE_LACKS_SYS_IOCTL_H
-#define ACE_LACKS_STROPTS_H
-#define ACE_LACKS_UCONTEXT_H
-#define ACE_LACKS_SYS_IPC_H
-#define ACE_LACKS_SYS_MMAN_H
-#define ACE_LACKS_SYS_RESOURCE_H
-#define ACE_LACKS_SYS_SELECT_H
-#define ACE_LACKS_SYS_SEM_H
-#define ACE_LACKS_SYS_SOCKET_H
-#define ACE_LACKS_SYS_TIME_H
-#define ACE_LACKS_SYS_UIO_H
-#define ACE_LACKS_SYS_WAIT_H
-#define ACE_LACKS_SYS_SHM_H
-#define ACE_LACKS_SYS_MSG_H
-#define ACE_LACKS_TERMIOS_H
-#define ACE_LACKS_POLL_H
-#define ACE_LACKS_NETINET_TCP_H
-#define ACE_HAS_3_PARAM_WCSTOK
-#define ACE_LACKS_STRCASECMP
-#define ENOTEMPTY     WSAENOTEMPTY
-
-#undef WIFEXITED
-#undef WEXITSTATUS
-
-#define _O_CREAT  O_CREAT
-#define _O_TRUNC   O_TRUNC
-#define _O_TEMPORARY   0
-#define _O_EXCL   O_EXCL
-#define _O_RDWR   O_RDWR
-#define _O_WRONLY O_WRONLY
-#define _O_RDONLY O_RDONLY
-#define _O_APPEND O_APPEND
-#define _O_BINARY O_BINARY
-#define _O_TEXT O_TEXT
-
-#define _endthreadex _endthread
-#define _beginthreadex _beginthread
-
-//Error codes that are in MS Visual C++
-#define EFAULT 99 /* Error code (should be in errno.h) */
-#define ENODEV          19
-#define EPIPE           32
-#define ENAMETOOLONG    38
-
-#define ACE_ENDTHREADEX(STATUS) ::_endthread ()
-
-#endif /* defined(__IBMCPP__) */
-
-#include /**/ "ace/post.h"
-#endif /* ACE_CONFIG_WIN32_VISUALAGE_H */
diff --git a/ACE/ace/config-win32.h b/ACE/ace/config-win32.h
index 8e54f80c3f9..1f915c23271 100644
--- a/ACE/ace/config-win32.h
+++ b/ACE/ace/config-win32.h
@@ -35,8 +35,6 @@
 #    include "ace/config-win32-borland.h"
 #elif defined (_MSC_VER)
 #    include "ace/config-win32-msvc.h"
-#elif defined (__IBMCPP__)
-#    include "ace/config-win32-visualage.h"
 #elif defined (ghs)
 #    include "ace/config-win32-ghs.h"
 #elif defined (__MINGW32__)