Removed OpenVMS support

27 files changed, 16 insertions, 478 deletions

diff --git a/ACE/ace/ACE.inl b/ACE/ace/ACE.inl
index 4e7a77e5d87..0a9a36ec597 100644
--- a/ACE/ace/ACE.inl
+++ b/ACE/ace/ACE.inl
@@ -226,7 +226,7 @@ ACE::send_i (ACE_HANDLE handle, const void *buf, size_t len)
 ACE_INLINE ssize_t
 ACE::recv_i (ACE_HANDLE handle, void *buf, size_t len)
 {
-#if defined (ACE_WIN32) || defined (ACE_OPENVMS) || defined (ACE_MQX)
+#if defined (ACE_WIN32) || defined (ACE_MQX)
   return ACE_OS::recv (handle, (char *) buf, len);
 #else
   return ACE_OS::read (handle, (char *) buf, len);
diff --git a/ACE/ace/CDR_Base.cpp b/ACE/ace/CDR_Base.cpp
index 9fbc28b305f..f2213f379eb 100644
--- a/ACE/ace/CDR_Base.cpp
+++ b/ACE/ace/CDR_Base.cpp
@@ -811,7 +811,7 @@ ACE_CDR::Fixed ACE_CDR::Fixed::from_integer (ACE_CDR::ULongLong val)
 
 ACE_CDR::Fixed ACE_CDR::Fixed::from_floating (LongDouble val)
 {
-#if defined ACE_OPENVMS || (defined ACE_VXWORKS && !defined __RTP__)
+#if defined ACE_VXWORKS && !defined __RTP__
   typedef double BigFloat;
 #elif defined NONNATIVE_LONGDOUBLE
   typedef LongDouble::NativeImpl BigFloat;
diff --git a/ACE/ace/DLL_Manager.cpp b/ACE/ace/DLL_Manager.cpp
index 7eddc0484fe..69f2c787c4a 100644
--- a/ACE/ace/DLL_Manager.cpp
+++ b/ACE/ace/DLL_Manager.cpp
@@ -286,11 +286,7 @@ ACE_DLL_Handle::symbol (const ACE_TCHAR *sym_name, bool ignore_errors, ACE_TStri
   // BTW. Handle lifecycle management is a little crazy in ACE
   if (this->handle_ != ACE_SHLIB_INVALID_HANDLE)
     {
-#if defined (ACE_OPENVMS)
-      void *sym =  ACE::ldsymbol (this->handle_, auto_name.get ());
-#else
       void *sym =  ACE_OS::dlsym (this->handle_, auto_name.get ());
-#endif
 
       // Linux says that the symbol could be null and that it isn't an
       // error.  So you should check the error message also, but since
@@ -758,13 +754,7 @@ ACE_DLL_Manager::unload_dll (ACE_DLL_Handle *dll_handle, int force_unload)
 
               void * const unload_policy_ptr =
                 dll_handle->symbol (ACE_TEXT ("_get_dll_unload_policy"), 1);
-#if defined (ACE_OPENVMS) && (!defined (__INITIAL_POINTER_SIZE) || (__INITIAL_POINTER_SIZE < 64))
-              int const temp_p =
-                reinterpret_cast<int> (unload_policy_ptr);
-#else
-              intptr_t const temp_p =
-                reinterpret_cast<intptr_t> (unload_policy_ptr);
-#endif
+              intptr_t const temp_p = reinterpret_cast<intptr_t> (unload_policy_ptr);
 
               dll_unload_policy const the_policy =
                 reinterpret_cast<dll_unload_policy> (temp_p);
diff --git a/ACE/ace/Global_Macros.h b/ACE/ace/Global_Macros.h
index aff8cf083c6..bc9b20a4962 100644
--- a/ACE/ace/Global_Macros.h
+++ b/ACE/ace/Global_Macros.h
@@ -559,27 +559,7 @@ ACE_MAKE_SVC_CONFIG_FACTORY_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (AC
  */
 # define ACE_Local_Service_Export
 
-#if defined (ACE_OPENVMS)
-# define ACE_PREPROC_STRINGIFY(A) #A
-# define ACE_MAKE_SVC_REGISTRAR_ARG(A) ACE_PREPROC_STRINGIFY(A), (void*)&A
-# define ACE_FACTORY_DEFINE(CLS,SERVICE_CLASS) \
-void ACE_MAKE_SVC_CONFIG_GOBBLER_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (void *p) { \
-  ACE_VERSIONED_NAMESPACE_NAME::ACE_Service_Object * _p = \
-    static_cast< ACE_VERSIONED_NAMESPACE_NAME::ACE_Service_Object *> (p); \
-  ACE_ASSERT (_p != 0); \
-  delete _p; } \
-extern "C" CLS##_Export ACE_VERSIONED_NAMESPACE_NAME::ACE_Service_Object *\
-ACE_MAKE_SVC_CONFIG_FACTORY_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (ACE_Service_Object_Exterminator *gobbler) \
-{ \
-  ACE_TRACE (#SERVICE_CLASS); \
-  if (gobbler != 0) \
-    *gobbler = (ACE_Service_Object_Exterminator) ACE_MAKE_SVC_CONFIG_GOBBLER_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS); \
-  return new SERVICE_CLASS; \
-} \
-ACE_Dynamic_Svc_Registrar ace_svc_reg_##SERVICE_CLASS \
-  (ACE_MAKE_SVC_REGISTRAR_ARG(ACE_MAKE_SVC_CONFIG_FACTORY_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS)));
-#else
-# define ACE_FACTORY_DEFINE(CLS,SERVICE_CLASS) \
+#define ACE_FACTORY_DEFINE(CLS,SERVICE_CLASS) \
 void ACE_MAKE_SVC_CONFIG_GOBBLER_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (void *p) { \
   ACE_VERSIONED_NAMESPACE_NAME::ACE_Service_Object * _p = \
     static_cast< ACE_VERSIONED_NAMESPACE_NAME::ACE_Service_Object *> (p); \
@@ -593,7 +573,6 @@ ACE_MAKE_SVC_CONFIG_FACTORY_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (AC
     *gobbler = (ACE_Service_Object_Exterminator) ACE_MAKE_SVC_CONFIG_GOBBLER_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS); \
   return new SERVICE_CLASS; \
 }
-#endif
 
 /**
  * For service classes scoped within namespaces, use this macro in
@@ -621,27 +600,7 @@ ACE_MAKE_SVC_CONFIG_FACTORY_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (AC
  * this will ensure unique generated signatures for the various C
  * style functions.
  */
-#if defined (ACE_OPENVMS)
-# define ACE_PREPROC_STRINGIFY(A) #A
-# define ACE_MAKE_SVC_REGISTRAR_ARG(A) ACE_PREPROC_STRINGIFY(A), (void*)&A
-# define ACE_FACTORY_NAMESPACE_DEFINE(CLS,SERVICE_CLASS,NAMESPACE_CLASS) \
-void ACE_MAKE_SVC_CONFIG_GOBBLER_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (void *p) { \
-  ACE_VERSIONED_NAMESPACE_NAME::ACE_Service_Object * _p = \
-    static_cast< ACE_VERSIONED_NAMESPACE_NAME::ACE_Service_Object *> (p); \
-  ACE_ASSERT (_p != 0); \
-  delete _p; } \
-extern "C" CLS##_Export ACE_VERSIONED_NAMESPACE_NAME::ACE_Service_Object *\
-ACE_MAKE_SVC_CONFIG_FACTORY_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (ACE_Service_Object_Exterminator *gobbler) \
-{ \
-  ACE_TRACE (#SERVICE_CLASS); \
-  if (gobbler != 0) \
-    *gobbler = (ACE_Service_Object_Exterminator) ACE_MAKE_SVC_CONFIG_GOBBLER_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS); \
-  return new NAMESPACE_CLASS; \
-} \
-ACE_Dynamic_Svc_Registrar ace_svc_reg_##SERVICE_CLASS \
-  (ACE_MAKE_SVC_REGISTRAR_ARG(ACE_MAKE_SVC_CONFIG_FACTORY_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS)));
-#else
-# define ACE_FACTORY_NAMESPACE_DEFINE(CLS,SERVICE_CLASS,NAMESPACE_CLASS) \
+#define ACE_FACTORY_NAMESPACE_DEFINE(CLS,SERVICE_CLASS,NAMESPACE_CLASS) \
 void ACE_MAKE_SVC_CONFIG_GOBBLER_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (void *p) { \
   ACE_VERSIONED_NAMESPACE_NAME::ACE_Service_Object * _p = \
     static_cast< ACE_VERSIONED_NAMESPACE_NAME::ACE_Service_Object *> (p); \
@@ -655,7 +614,6 @@ ACE_MAKE_SVC_CONFIG_FACTORY_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (AC
     *gobbler = (ACE_Service_Object_Exterminator) ACE_MAKE_SVC_CONFIG_GOBBLER_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS); \
   return new NAMESPACE_CLASS; \
 }
-#endif
 
 /// The canonical name for a service factory method
 # define ACE_SVC_NAME(SERVICE_CLASS) ACE_MAKE_SVC_CONFIG_FACTORY_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS)
diff --git a/ACE/ace/Lib_Find.cpp b/ACE/ace/Lib_Find.cpp
index d3f93584e8e..085ed0b938e 100644
--- a/ACE/ace/Lib_Find.cpp
+++ b/ACE/ace/Lib_Find.cpp
@@ -16,101 +16,6 @@
 #  include "ace/OS_NS_strings.h"
 #endif /* ACE_WIN32 */
 
-#if defined (ACE_OPENVMS)
-#include "ace/RB_Tree.h"
-#include "ace/Thread_Mutex.h"
-#include "ace/Singleton.h"
-
-#include /**/ "descrip.h"
-#include /**/ "chfdef.h"
-#include /**/ "stsdef.h"
-#include /**/ "libdef.h"
-
-extern "C" int LIB$FIND_IMAGE_SYMBOL(...);
-
-/**
- * @internal
- *
- * Implements a class to register symbols and addresses for use with DLL
- * symbol retrieval.
- *
- * OpenVMS restricts symbol length to 31 characters encoding any symbols
- * longer than that. In these cases dlsym() only works with the encoded
- * names.
- * This creates serious problems for the service configurator framework
- * where the factory method names often exceed 31 chars and where loading
- * is based on retrieval of method pointers using the *full* name.
- * For OpenVMS we therefor added this singleton class and the
- * ACE_Dynamic_Svc_Registrar class which registers full names and function
- * pointers with this singleton at the time the static ACE_Dynamic_Svc_Registrar
- * object is created in a (service) DLL.
- * By forcing the DLL to load using a common symbol ("NULL") we trigger static
- * object creation *before* the full names are referenced.
- * Symbol references will be resolved as follows on OpenVMS:
- * - first try directly from DLL using the RTL dlsym() function and if that fails;
- * - try to find symbol in singleton registry.
- */
-class ACE_LD_Symbol_Registry
-{
-public:
-  typedef ACE_RB_Tree<const ACE_TCHAR*,
-                      void*,
-                      ACE_Less_Than<const ACE_TCHAR*>,
-                      ACE_Thread_Mutex>
-          TREE;
-
-  void register_symbol (const ACE_TCHAR* symname, void* symaddr);
-
-  void* find_symbol (const ACE_TCHAR* symname);
-
-  ACE_LD_Symbol_Registry () = default;
-
-private:
-  TREE symbol_registry_;
-};
-
-void
-ACE_LD_Symbol_Registry::register_symbol (const ACE_TCHAR* symname,
-                                         void* symaddr)
-{
-  int const result = symbol_registry_.bind (symname, symaddr);
-  if (result == 1)
-    {
-      ACELIB_DEBUG((LM_INFO, ACE_TEXT ("ACE_LD_Symbol_Registry:")
-                          ACE_TEXT (" duplicate symbol %s registered\n"),
-                          ACE_TEXT_ALWAYS_CHAR (symname)));
-    }
-  else if (result == -1)
-    {
-      ACELIB_ERROR((LM_ERROR, ACE_TEXT ("ACE_LD_Symbol_Registry:")
-                           ACE_TEXT (" failed to register symbol %s\n"),
-                           ACE_TEXT_ALWAYS_CHAR (symname)));
-    }
-}
-
-void*
-ACE_LD_Symbol_Registry::find_symbol (const ACE_TCHAR* symname)
-{
-  void* symaddr = 0;
-  int const result = symbol_registry_.find (symname, symaddr);
-
-  return (result == 0 ? symaddr : 0);
-}
-
-/// Declare a process wide singleton
-ACE_SINGLETON_DECLARE (ACE_Singleton,
-                       ACE_LD_Symbol_Registry,
-                       ACE_Thread_Mutex)
-
-typedef ACE_Singleton<ACE_LD_Symbol_Registry, ACE_Thread_Mutex>
-        ACE_LD_SYMBOL_REGISTRY;
-
-ACE_SINGLETON_TEMPLATE_INSTANTIATE(ACE_Singleton, ACE_LD_Symbol_Registry, ACE_SYNCH_MUTEX);
-
-
-#endif
-
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 int
@@ -119,76 +24,6 @@ ACE::ldfind (const ACE_TCHAR* filename,
              size_t maxpathnamelen)
 {
   ACE_TRACE ("ACE::ldfind");
-#if defined (ACE_OPENVMS)
-  if (ACE_OS::strlen (filename) >= maxpathnamelen)
-    {
-      errno = ENOMEM;
-      return -1;
-    }
-
-  dsc$descriptor nameDsc;
-  nameDsc.dsc$b_class = DSC$K_CLASS_S;
-  nameDsc.dsc$b_dtype = DSC$K_DTYPE_T;
-  nameDsc.dsc$w_length = ACE_OS::strlen (filename);
-  nameDsc.dsc$a_pointer = (char*)filename;
-
-  char symbol[] = "NULL";
-  dsc$descriptor symbolDsc;
-  symbolDsc.dsc$b_class = DSC$K_CLASS_S;
-  symbolDsc.dsc$b_dtype = DSC$K_DTYPE_T;
-  symbolDsc.dsc$w_length = ACE_OS::strlen (symbol);
-  symbolDsc.dsc$a_pointer = symbol;
-
-  int symbolValue;
-  int result;
-  try
-    {
-      result = LIB$FIND_IMAGE_SYMBOL (&nameDsc, &symbolDsc, &symbolValue, 0, 0);
-    }
-  catch (chf$signal_array &sig)
-    {
-      result = sig.chf$l_sig_name;
-    }
-
-  int severity = result & STS$M_SEVERITY;
-  int conditionId = result & STS$M_COND_ID;
-  if (severity == STS$K_SUCCESS || severity == STS$K_WARNING || severity == STS$K_INFO ||
-      (severity == STS$K_ERROR && conditionId == (LIB$_KEYNOTFOU & STS$M_COND_ID)))
-    {
-      ACE_OS::strcpy (pathname, filename);
-      return 0;
-    }
-
-  if (ACE_OS::strlen (filename) + ACE_OS::strlen (ACE_DLL_PREFIX) >= maxpathnamelen)
-    {
-      errno = ENOMEM;
-      return -1;
-    }
-
-
-  ACE_OS::strcpy (pathname, ACE_DLL_PREFIX);
-  ACE_OS::strcat (pathname, filename);
-  nameDsc.dsc$w_length = ACE_OS::strlen (pathname);
-  nameDsc.dsc$a_pointer = pathname;
-  try
-    {
-      result = LIB$FIND_IMAGE_SYMBOL (&nameDsc, &symbolDsc, &symbolValue, 0, 0);
-    }
-  catch (chf$signal_array &sig)
-    {
-      result = sig.chf$l_sig_name;
-    }
-
-  severity = result & STS$M_SEVERITY;
-  conditionId = result & STS$M_COND_ID;
-  if (severity == STS$K_SUCCESS || severity == STS$K_WARNING || severity == STS$K_INFO ||
-      (severity == STS$K_ERROR && conditionId == (LIB$_KEYNOTFOU & STS$M_COND_ID)))
-    {
-      return 0;
-    }
-  errno = ENOENT;
-  return -1;
-#endif /* ACE_OPENVMS */
 
 #if defined (ACE_WIN32) && !defined (ACE_HAS_PHARLAP)
   ACE_TCHAR expanded_filename[MAXPATHLEN];
@@ -544,29 +379,6 @@ ACE::ldname (const ACE_TCHAR *entry_point)
 #endif /* ACE_NEEDS_DL_UNDERSCORE */
 }
 
-#if defined (ACE_OPENVMS)
-void
-ACE::ldregister (const ACE_TCHAR *entry_point,
-                 void* entry_addr)
-{
-  ACE_LD_SYMBOL_REGISTRY::instance ()->register_symbol (entry_point,
-                                                        entry_addr);
-}
-
-void *
-ACE::ldsymbol (ACE_SHLIB_HANDLE sh, const ACE_TCHAR *entry_point)
-{
-  void* symaddr = ACE_OS::dlsym (sh, entry_point);
-  // if not found through dlsym() try registry
-  if (!symaddr)
-    {
-      symaddr = ACE_LD_SYMBOL_REGISTRY::instance ()->find_symbol (entry_point);
-    }
-
-  return symaddr;
-}
-#endif
-
 int
 ACE::get_temp_dir (ACE_TCHAR *buffer, size_t buffer_len)
 {
diff --git a/ACE/ace/Lib_Find.h b/ACE/ace/Lib_Find.h
index 3c72a1fc572..6496a93dc4d 100644
--- a/ACE/ace/Lib_Find.h
+++ b/ACE/ace/Lib_Find.h
@@ -16,9 +16,6 @@
 #include /**/ "ace/config-all.h"
 #include /**/ "ace/ACE_export.h"
 #include "ace/os_include/os_stdio.h"
-#if defined (ACE_OPENVMS)
-# include "ace/OS_NS_dlfcn.h"
-#endif
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -57,26 +54,6 @@ namespace ACE
    */
   extern ACE_Export ACE_TCHAR *ldname (const ACE_TCHAR *entry_point);
 
-
-#if defined (ACE_OPENVMS)
-  /**
-   * Registers an @a entry_point and its address for later retrieval
-   * through the ACE::ldsymbol () method.
-   * For use in cases where the OS compiler encodes long symbolnames.
-   */
-  extern ACE_Export void ldregister (const ACE_TCHAR *entry_point,
-                                     void* entry_addr);
-
-  /**
-   * Looks up an @a entry_point address either from previously registered
-   * symbols or through ACE_OS::dlsym ().
-   * Returns 0 in case the entry_point is not found, otherwise nonzero.
-   * For use in cases where the OS compiler encodes long symbolnames.
-   */
-  extern ACE_Export void *ldsymbol (ACE_SHLIB_HANDLE sh,
-                                    const ACE_TCHAR *entry_point);
-#endif
-
   /**
    * Returns the temporary directory including the trailing slash in
    * @a buffer.  Returns -1 for an error or if the buffer_len is not
diff --git a/ACE/ace/Log_Msg.cpp b/ACE/ace/Log_Msg.cpp
index b0f51f7cb0f..db78a8203ca 100644
--- a/ACE/ace/Log_Msg.cpp
+++ b/ACE/ace/Log_Msg.cpp
@@ -1262,12 +1262,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str,
                   break;
 
                 case 'P':             // Process ID
-#if defined (ACE_OPENVMS)
-                  // Print the process id in hex on OpenVMS.
-                  ACE_OS::strcpy (fp, ACE_TEXT ("x"));
-#else
                   ACE_OS::strcpy (fp, ACE_TEXT ("d"));
-#endif
                   if (can_check)
                     this_len = ACE_OS::snprintf
                       (bp, bspace, format,
diff --git a/ACE/ace/MMAP_Memory_Pool.cpp b/ACE/ace/MMAP_Memory_Pool.cpp
index 607d3177196..a2689104e79 100644
--- a/ACE/ace/MMAP_Memory_Pool.cpp
+++ b/ACE/ace/MMAP_Memory_Pool.cpp
@@ -255,10 +255,6 @@ ACE_MMAP_Memory_Pool::commit_backing_store_name (size_t rounded_bytes,
                           -1);
     }
 
-#if defined (ACE_OPENVMS)
-  ::fsync(this->mmap_.handle());
-#endif
-
   // Increment by one to put us at the beginning of the next chunk...
   ++map_size;
 #endif /* __Lynx__ */
diff --git a/ACE/ace/Mem_Map.cpp b/ACE/ace/Mem_Map.cpp
index 47fa9b2b3d2..e44677922f0 100644
--- a/ACE/ace/Mem_Map.cpp
+++ b/ACE/ace/Mem_Map.cpp
@@ -188,8 +188,6 @@ ACE_Mem_Map::open (const ACE_TCHAR *file_name,
 
 #if defined (INTEGRITY)  || defined (__QNXNTO__) || defined (ACE_VXWORKS)
   this->handle_ = ACE_OS::shm_open (file_name, flags, perms, sa);
-#elif defined (ACE_OPENVMS)
-  ACE_OSCALL (::open (file_name, flags, perms, "shr=get,put,upd"), ACE_HANDLE, this->handle_);
 #else
   this->handle_ = ACE_OS::open (file_name, flags, perms, sa);
 #endif /* INTEGRITY */
diff --git a/ACE/ace/OS_Memory.h b/ACE/ace/OS_Memory.h
index fd8262de6ae..eec0b65df8f 100644
--- a/ACE/ace/OS_Memory.h
+++ b/ACE/ace/OS_Memory.h
@@ -123,40 +123,13 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
  * @param ptr the base pointer
  * @param alignment the required alignment
  */
-#if defined (ACE_OPENVMS) && (!defined (__INITIAL_POINTER_SIZE) || (__INITIAL_POINTER_SIZE < 64))
-inline unsigned int
-ACE_align_binary (unsigned int ptr, unsigned int alignment)
-{
-  unsigned int const tmp = alignment - 1;
-  return (ptr + tmp) & (~tmp);
-}
-#else
 inline uintptr_t
 ACE_align_binary (uintptr_t ptr, uintptr_t alignment)
 {
   uintptr_t const tmp = alignment - 1;
   return (ptr + tmp) & (~tmp);
 }
-#endif
 
-#if defined (ACE_OPENVMS) && (!defined (__INITIAL_POINTER_SIZE) || (__INITIAL_POINTER_SIZE < 64))
-/// Return the next address aligned to a required boundary
-inline char *
-ACE_ptr_align_binary (char const * ptr, unsigned int alignment)
-{
-  return
-    reinterpret_cast<char *> (
-      ACE_align_binary (reinterpret_cast<unsigned int> (ptr), alignment));
-}
-
-/// Return the next address aligned to a required boundary
-inline char *
-ACE_ptr_align_binary (unsigned char const * ptr, unsigned int alignment)
-{
-  return
-    ACE_ptr_align_binary (reinterpret_cast<char const *> (ptr), alignment);
-}
-#else
 /// Return the next address aligned to a required boundary
 inline char *
 ACE_ptr_align_binary (char const * ptr, uintptr_t alignment)
@@ -173,7 +146,6 @@ ACE_ptr_align_binary (unsigned char const * ptr, uintptr_t alignment)
   return
     ACE_ptr_align_binary (reinterpret_cast<char const *> (ptr), alignment);
 }
-#endif  /* ACE_OPENVMS && __INITIAL_POINTER_SIZE < 64 */
 //@}
 ACE_END_VERSIONED_NAMESPACE_DECL
 
diff --git a/ACE/ace/OS_NS_stdio.h b/ACE/ace/OS_NS_stdio.h
index d1e01ee4a56..19aa67f5026 100644
--- a/ACE/ace/OS_NS_stdio.h
+++ b/ACE/ace/OS_NS_stdio.h
@@ -27,10 +27,9 @@
 #include "ace/os_include/os_errno.h"
 #include /**/ "ace/ACE_export.h"
 
-/* OPENVMS needs unistd for cuserid() */
-#if defined (CYGWIN32) || defined (ACE_OPENVMS)
+#if defined (CYGWIN32)
 #  include "ace/os_include/os_unistd.h"
-#endif /* CYGWIN32 || ACE_OPENVMS */
+#endif /* CYGWIN32 */
 
 #if defined (ACE_WIN32)
 # include "io.h"
diff --git a/ACE/ace/OS_NS_stdlib.inl b/ACE/ace/OS_NS_stdlib.inl
index 19ef547d013..d40c139c860 100644
--- a/ACE/ace/OS_NS_stdlib.inl
+++ b/ACE/ace/OS_NS_stdlib.inl
@@ -108,12 +108,6 @@ ACE_OS::atop (const char *s)
   ACE_TRACE ("ACE_OS::atop");
 #if defined (ACE_WIN64)
   intptr_t ip = ::_atoi64 (s);
-#elif defined (ACE_OPENVMS)
-#  if !defined (__INITIAL_POINTER_SIZE) || (__INITIAL_POINTER_SIZE < 64)
-  int ip = ::atoi (s);
-#  else
-  intptr_t ip = ::atoi (s);
-#  endif
 #else
   intptr_t ip = ::atoi (s);
 #endif /* ACE_WIN64 */
@@ -127,12 +121,6 @@ ACE_OS::atop (const wchar_t *s)
 {
 #  if defined (ACE_WIN64)
   intptr_t ip = ::_wtoi64 (s);
-#  elif defined (ACE_OPENVMS)
-#    if !defined (__INITIAL_POINTER_SIZE) || (__INITIAL_POINTER_SIZE < 64)
-  int ip = ACE_OS::atoi (s);
-#    else
-  intptr_t ip = ACE_OS::atoi (s);
-#    endif
 #  else
   intptr_t ip = ACE_OS::atoi (s);
 #  endif /* ACE_WIN64 */
diff --git a/ACE/ace/OS_NS_sys_mman.inl b/ACE/ace/OS_NS_sys_mman.inl
index 1cc6bac8dd9..5ff514997b5 100644
--- a/ACE/ace/OS_NS_sys_mman.inl
+++ b/ACE/ace/OS_NS_sys_mman.inl
@@ -130,11 +130,6 @@ ACE_OS::mmap (void *addr,
   flags |= ACE_OS_EXTRA_MMAP_FLAGS;
 #  endif /* ACE_OS_EXTRA_MMAP_FLAGS */
   ACE_UNUSED_ARG (file_mapping);
-#  if defined (ACE_OPENVMS)
-  //FUZZ: disable check_for_lack_ACE_OS
-  ::fsync(file_handle);
-  //FUZZ: enable check_for_lack_ACE_OS
-#  endif
   //FUZZ: disable check_for_lack_ACE_OS
   ACE_OSCALL_RETURN ((void *) ::mmap ((ACE_MMAP_TYPE) addr,
                                       len,
@@ -240,10 +235,6 @@ ACE_OS::shm_open (const ACE_TCHAR *filename,
   filename = buf;
 #endif
   return ::shm_open (ACE_TEXT_ALWAYS_CHAR(filename), mode, perms);
-#elif defined (ACE_OPENVMS)
-  //FUZZ: disable check_for_lack_ACE_OS
-  return ::open (filename, mode, perms, ACE_TEXT("shr=get,put,upd"));
-  //FUZZ: enable check_for_lack_ACE_OS
 #else  /* ! ACE_HAS_SHM_OPEN */
   // Just use ::open.
   return ACE_OS::open (filename, mode, perms, sa);
diff --git a/ACE/ace/OS_NS_sys_stat.inl b/ACE/ace/OS_NS_sys_stat.inl
index de6c16fcc76..9dec20de7f9 100644
--- a/ACE/ace/OS_NS_sys_stat.inl
+++ b/ACE/ace/OS_NS_sys_stat.inl
@@ -64,11 +64,6 @@ namespace ACE_OS
 #elif defined (ACE_MQX)
     return MQX_Filesystem::inst ().fstat (handle, stp);
 #else
-#  if defined (ACE_OPENVMS)
-    //FUZZ: disable check_for_lack_ACE_OS
-    ::fsync(handle);
-    //FUZZ: enable check_for_lack_ACE_OS
-#  endif
     return ::fstat (handle, stp);
 #endif /* !ACE_HAS_X86_STAT_MACROS */
   }
diff --git a/ACE/ace/Parse_Node.cpp b/ACE/ace/Parse_Node.cpp
index 295d3160a90..76b763da3df 100644
--- a/ACE/ace/Parse_Node.cpp
+++ b/ACE/ace/Parse_Node.cpp
@@ -700,14 +700,9 @@ ACE_Function_Node::symbol (ACE_Service_Gestalt *,
           return 0;
         }
 
-#if defined (ACE_OPENVMS) && (!defined (__INITIAL_POINTER_SIZE) || (__INITIAL_POINTER_SIZE < 64))
-      int const temp_p = reinterpret_cast<int> (func_p);
-#else
       intptr_t const temp_p = reinterpret_cast<intptr_t> (func_p);
-#endif
 
-      ACE_Service_Factory_Ptr func =
-        reinterpret_cast<ACE_Service_Factory_Ptr> (temp_p);
+      ACE_Service_Factory_Ptr func = reinterpret_cast<ACE_Service_Factory_Ptr> (temp_p);
 
       // Invoke the factory function and record it's return value.
       this->symbol_ = (*func) (gobbler);
diff --git a/ACE/ace/Pipe.cpp b/ACE/ace/Pipe.cpp
index 6946b436619..dc6aa4c7ddf 100644
--- a/ACE/ace/Pipe.cpp
+++ b/ACE/ace/Pipe.cpp
@@ -228,21 +228,6 @@ ACE_Pipe::open (int buffer_size)
       return -1;
     }
 # endif /* ! ACE_LACKS_SO_SNDBUF */
-# if defined (ACE_OPENVMS) && !defined (ACE_LACKS_TCP_NODELAY)
-  int one = 1;
-  // OpenVMS implements socketpair(AF_UNIX...) by returning AF_INET sockets.
-  // Since these are plagued by Nagle as any other INET socket we need to set
-  // TCP_NODELAY on the write handle.
-  if (ACE_OS::setsockopt (this->handles_[1],
-                          ACE_IPPROTO_TCP,
-                          TCP_NODELAY,
-                          reinterpret_cast <const char *> (&one),
-                          sizeof (one)) == -1)
-    {
-      this->close ();
-      return -1;
-    }
-# endif /* ACE_OPENVMS && !ACE_LACKS_TCP_NODELAY */
 #endif  /* ! ACE_LACKS_SOCKETPAIR && ! ACE_HAS_STREAM_PIPES */
   // Point both the read and write HANDLES to the appropriate socket
   // HANDLEs.
diff --git a/ACE/ace/Process.cpp b/ACE/ace/Process.cpp
index 3386a348582..afa7a0da98d 100644
--- a/ACE/ace/Process.cpp
+++ b/ACE/ace/Process.cpp
@@ -190,67 +190,6 @@ ACE_Process::spawn (ACE_Process_Options &options)
       return this->getpid ();
     }
   return ACE_INVALID_PID;
-
-#elif defined(ACE_OPENVMS)
-  if (ACE_BIT_ENABLED (options.creation_flags (),
-                       ACE_Process_Options::NO_EXEC))
-    ACE_NOTSUP_RETURN (ACE_INVALID_PID);
-
-  int saved_stdin = ACE_STDIN;
-  int saved_stdout = ACE_STDOUT;
-  int saved_stderr = ACE_STDERR;
-  // Save STD file descriptors and redirect
-  if (options.get_stdin () != ACE_INVALID_HANDLE) {
-    if ((saved_stdin = ACE_OS::dup (ACE_STDIN)) == -1 && errno != EBADF)
-      ACE_OS::exit (errno);
-    if (ACE_OS::dup2 (options.get_stdin (), ACE_STDIN) == -1)
-      ACE_OS::exit (errno);
-  }
-  if (options.get_stdout () != ACE_INVALID_HANDLE) {
-    if ((saved_stdout = ACE_OS::dup (ACE_STDOUT)) == -1 && errno != EBADF)
-      ACE_OS::exit (errno);
-    if (ACE_OS::dup2 (options.get_stdout (), ACE_STDOUT) == -1)
-      ACE_OS::exit (errno);
-  }
-  if (options.get_stderr () != ACE_INVALID_HANDLE) {
-    if ((saved_stderr = ACE_OS::dup (ACE_STDERR)) == -1 && errno != EBADF)
-      ACE_OS::exit (errno);
-    if (ACE_OS::dup2 (options.get_stderr (), ACE_STDERR) == -1)
-      ACE_OS::exit (errno);
-  }
-
-  if (options.working_directory () != 0)
-    ACE_NOTSUP_RETURN (ACE_INVALID_PID);
-
-  this->child_id_ = vfork();
-  if (this->child_id_ == 0) {
-      ACE_OS::execvp (options.process_name (),
-                options.command_line_argv ());
-      // something went wrong
-      this->child_id_ = ACE_INVALID_PID;
-  }
-
-  // restore STD file descriptors (if necessary)
-  if (options.get_stdin () != ACE_INVALID_HANDLE) {
-    if (saved_stdin == -1)
-      ACE_OS::close (ACE_STDIN);
-    else
-      ACE_OS::dup2 (saved_stdin, ACE_STDIN);
-  }
-  if (options.get_stdout () != ACE_INVALID_HANDLE) {
-    if (saved_stdout == -1)
-      ACE_OS::close (ACE_STDOUT);
-    else
-      ACE_OS::dup2 (saved_stdout, ACE_STDOUT);
-  }
-  if (options.get_stderr () != ACE_INVALID_HANDLE) {
-    if (saved_stderr == -1)
-      ACE_OS::close (ACE_STDERR);
-    else
-      ACE_OS::dup2 (saved_stderr, ACE_STDERR);
-  }
-
-  return this->child_id_;
 #elif defined (ACE_VXWORKS) && defined (__RTP__)
   if (ACE_BIT_ENABLED (options.creation_flags (),
                        ACE_Process_Options::NO_EXEC))
diff --git a/ACE/ace/SSL/SSL_Context.cpp b/ACE/ace/SSL/SSL_Context.cpp
index 09020466e73..44fea0d26bc 100644
--- a/ACE/ace/SSL/SSL_Context.cpp
+++ b/ACE/ace/SSL/SSL_Context.cpp
@@ -516,7 +516,7 @@ ACE_SSL_Context::load_trusted_ca (const char* ca_file,
         }
 
       // SSL_add_dir_cert_subjects_to_stack is defined at 0.9.8a (but not
-      // on OpenVMS or Mac Classic); it may be available earlier. Change
+      // on Mac Classic); it may be available earlier. Change
       // this comparison if so. It's still (1.0.1g) broken on windows too.
 #if defined (OPENSSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x0090801fL)
 #  if !defined (OPENSSL_SYS_VMS) && !defined (OPENSSL_SYS_MACINTOSH_CLASSIC)
diff --git a/ACE/ace/Service_Gestalt.cpp b/ACE/ace/Service_Gestalt.cpp
index fe41085324d..bc82751959c 100644
--- a/ACE/ace/Service_Gestalt.cpp
+++ b/ACE/ace/Service_Gestalt.cpp
@@ -819,14 +819,8 @@ ACE_Service_Gestalt::get_xml_svc_conf (ACE_DLL &xmldll)
                        ACE_TEXT("ACE_Service_Config::get_xml_svc_conf")),
                       0);
 
-  void * foo =
-    xmldll.symbol (ACE_TEXT ("_ACEXML_create_XML_Svc_Conf_Object"));
-
-#if defined (ACE_OPENVMS) && (!defined (__INITIAL_POINTER_SIZE) || (__INITIAL_POINTER_SIZE < 64))
-  int const temp_p = reinterpret_cast<int> (foo);
-#else
+  void * foo = xmldll.symbol (ACE_TEXT ("_ACEXML_create_XML_Svc_Conf_Object"));
   intptr_t const temp_p = reinterpret_cast<intptr_t> (foo);
-#endif
 
   ACE_XML_Svc_Conf::Factory factory = reinterpret_cast<ACE_XML_Svc_Conf::Factory> (temp_p);
 
diff --git a/ACE/ace/Service_Object.cpp b/ACE/ace/Service_Object.cpp
index c7429cfb075..79060626410 100644
--- a/ACE/ace/Service_Object.cpp
+++ b/ACE/ace/Service_Object.cpp
@@ -14,9 +14,6 @@
 #include "ace/DLL.h"
 #include "ace/ACE.h"
 #include "ace/Log_Category.h"
-#if defined (ACE_OPENVMS)
-# include "ace/Lib_Find.h"
-#endif
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -177,13 +174,4 @@ ACE_Service_Type::name (const ACE_TCHAR *n)
   this->name_ = ACE::strnew (n);
 }
 
-#if defined (ACE_OPENVMS)
-ACE_Dynamic_Svc_Registrar::ACE_Dynamic_Svc_Registrar (const ACE_TCHAR* alloc_name,
-                                                      void* svc_allocator)
-{
-  // register service allocator function by full name in ACE singleton registry
-  ACE::ldregister (alloc_name, svc_allocator);
-}
-#endif
-
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Service_Object.h b/ACE/ace/Service_Object.h
index 4f123319c2e..287391e5202 100644
--- a/ACE/ace/Service_Object.h
+++ b/ACE/ace/Service_Object.h
@@ -180,20 +180,6 @@ private:
   ACE_Service_Object *service_object_;
 };
 
-#if defined (ACE_OPENVMS)
-/**
- * @class ACE_Dynamic_Svc_Registrar
- *
- * @brief Used to register Service allocator function by its full name.
- */
-class ACE_Dynamic_Svc_Registrar
-{
-public:
-  ACE_Dynamic_Svc_Registrar (const ACE_TCHAR* alloc_name,
-                             void* svc_allocator);
-};
-#endif
-
 ACE_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
diff --git a/ACE/ace/Sock_Connect.cpp b/ACE/ace/Sock_Connect.cpp
index 3bdfb53c03a..32df890caa1 100644
--- a/ACE/ace/Sock_Connect.cpp
+++ b/ACE/ace/Sock_Connect.cpp
@@ -1012,7 +1012,7 @@ ACE::get_ip_interfaces (size_t &count, ACE_INET_Addr *&addrs)
   return get_ip_interfaces_hpux (count, addrs);
 #elif defined (_AIX)
   return get_ip_interfaces_aix (count, addrs);
-#elif (defined (__unix) || defined (__unix__) || defined (ACE_OPENVMS) || (defined (ACE_VXWORKS) && !defined (ACE_HAS_GETIFADDRS)) || defined (ACE_HAS_RTEMS)) && !defined (ACE_LACKS_NETWORKING)
+#elif (defined (__unix) || defined (__unix__) || (defined (ACE_VXWORKS) && !defined (ACE_HAS_GETIFADDRS)) || defined (ACE_HAS_RTEMS)) && !defined (ACE_LACKS_NETWORKING)
   // COMMON (SVR4 and BSD) UNIX CODE
 
   // Call specific routine as necessary.
@@ -1341,7 +1341,7 @@ ACE::get_handle ()
   ACE_HANDLE handle = ACE_INVALID_HANDLE;
 #if defined (sparc)
   handle = ACE_OS::open ("/dev/udp", O_RDONLY);
-#elif defined (__unix) || defined (__unix__) || defined (_AIX) || defined (__hpux) || (defined (ACE_VXWORKS) && (ACE_VXWORKS >= 0x600)) || defined (ACE_OPENVMS) || defined (ACE_HAS_RTEMS)
+#elif defined (__unix) || defined (__unix__) || defined (_AIX) || defined (__hpux) || (defined (ACE_VXWORKS) && (ACE_VXWORKS >= 0x600)) || defined (ACE_HAS_RTEMS)
   // Note: DEC CXX doesn't define "unix" BSD compatible OS: HP UX,
   // AIX, SunOS 4.x
 
diff --git a/ACE/ace/Strategies_T.cpp b/ACE/ace/Strategies_T.cpp
index 1ada5a8543d..3ae02a406eb 100644
--- a/ACE/ace/Strategies_T.cpp
+++ b/ACE/ace/Strategies_T.cpp
@@ -16,9 +16,6 @@
 #include "ace/OS_NS_string.h"
 #include "ace/OS_Errno.h"
 #include "ace/Svc_Handler.h"
-#if defined (ACE_OPENVMS)
-# include "ace/Lib_Find.h"
-#endif
 
 #if !defined (__ACE_INLINE__)
 #include "ace/Strategies_T.inl"
@@ -118,15 +115,8 @@ ACE_DLL_Strategy<SVC_HANDLER>::make_svc_handler (SVC_HANDLER *&sh)
   ACE_SHLIB_HANDLE handle = ACE_OS::dlopen (this->dll_name_);
 
   // Extract the factory function.
-#if defined (ACE_OPENVMS)
   SVC_HANDLER *(*factory)(void) =
-    (SVC_HANDLER *(*)(void)) ACE::ldsymbol (handle,
-                                            this->factory_function_);
-#else
-  SVC_HANDLER *(*factory)(void) =
-    (SVC_HANDLER *(*)(void)) ACE_OS::dlsym (handle,
-                                            this->factory_function_);
-#endif
+    (SVC_HANDLER *(*)(void)) ACE_OS::dlsym (handle, this->factory_function_);
 
   // Call the factory function to obtain the new SVC_Handler (should
   // use RTTI here when it becomes available...)
diff --git a/ACE/ace/ace_wchar.h b/ACE/ace/ace_wchar.h
index 9897a6bd93e..4488e9d20ec 100644
--- a/ACE/ace/ace_wchar.h
+++ b/ACE/ace/ace_wchar.h
@@ -35,9 +35,6 @@
 #     include /**/ <wchar.h>
 #     include /**/ <wctype.h>
 #   endif
-# elif defined (ACE_OPENVMS)
-#   include /**/ <wchar.h>
-#   include /**/ <wctype.h>
 # else
 #   include /**/ <cwchar>
 #   include /**/ <cwctype>
diff --git a/ACE/ace/config-macros.h b/ACE/ace/config-macros.h
index 57e91329998..e64efa29939 100644
--- a/ACE/ace/config-macros.h
+++ b/ACE/ace/config-macros.h
@@ -101,7 +101,7 @@
 
 # if !defined (ACE_HAS_PROCESS_SPAWN)
 #   if !defined (ACE_LACKS_FORK) || \
-       (defined (ACE_WIN32) && !defined (ACE_HAS_PHARLAP)) || defined (ACE_OPENVMS)
+       (defined (ACE_WIN32) && !defined (ACE_HAS_PHARLAP))
 #     define ACE_HAS_PROCESS_SPAWN 1
 #   endif
 # endif /* ACE_HAS_PROCESS_SPAWN */
diff --git a/ACE/ace/os_include/os_time.h b/ACE/ace/os_include/os_time.h
index 5970afb2d65..a6a12c845ef 100644
--- a/ACE/ace/os_include/os_time.h
+++ b/ACE/ace/os_include/os_time.h
@@ -57,12 +57,8 @@ typedef struct timespec
   long tv_nsec;
 } timespec_t;
 # elif defined (ACE_HAS_BROKEN_POSIX_TIME)
-#  if defined (ACE_OPENVMS)
-#     include /**/ <timers.h>
-#  else
 // OSF/1 defines struct timespec in <sys/timers.h> - Tom Marrs
 #     include /**/ <sys/timers.h>
-#  endif
 # endif /* !ACE_HAS_POSIX_TIME */
 
 # if defined(ACE_LACKS_TIMESPEC_T)
diff --git a/ACE/ace/os_include/sys/os_types.h b/ACE/ace/os_include/sys/os_types.h
index 261cce91cc8..8bab5aafdc6 100644
--- a/ACE/ace/os_include/sys/os_types.h
+++ b/ACE/ace/os_include/sys/os_types.h
@@ -53,8 +53,7 @@ typedef double ACE_timer_t;
 
 #if defined (ACE_SIZEOF_LONG) && ACE_SIZEOF_LONG == 8
    typedef off_t ACE_LOFF_T;
-#elif defined (ACE_HAS_RTEMS) || defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) || defined (__APPLE__) || \
-  (defined (ACE_OPENVMS) && defined (_LARGEFILE))
+#elif defined (ACE_HAS_RTEMS) || defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) || defined (__APPLE__) ||
    typedef off_t ACE_LOFF_T;
 #elif defined (AIX) || defined (HPUX) || defined (__QNX__)
    typedef off64_t ACE_LOFF_T;
@@ -62,9 +61,7 @@ typedef double ACE_timer_t;
    typedef offset_t ACE_LOFF_T;
 #elif defined (WIN32)
    typedef __int64  ACE_LOFF_T;
-#elif (defined (ACE_VXWORKS) && (ACE_VXWORKS <= 0x700)) || \
-  defined (ACE_LYNXOS_MAJOR) || \
-  (defined (ACE_OPENVMS) && !defined (_LARGEFILE))
+#elif (defined (ACE_VXWORKS) && (ACE_VXWORKS <= 0x700)) || defined (ACE_LYNXOS_MAJOR)
    typedef long long ACE_LOFF_T;
 #else
    typedef loff_t ACE_LOFF_T;