4 files changed, 2 insertions, 64 deletions

diff --git a/TAO/TAO_IDL/fe/fe_utils.cpp b/TAO/TAO_IDL/fe/fe_utils.cpp
index d63e3a2f841..1da6d96da19 100644
--- a/TAO/TAO_IDL/fe/fe_utils.cpp
+++ b/TAO/TAO_IDL/fe/fe_utils.cpp
@@ -436,7 +436,7 @@ FE_Utils::create_implied_ami_uses_stuff ()
 int
 FE_Utils::path_cmp (const char *s, const char *t)
 {
-#if defined (WIN32) || defined (ACE_OPENVMS)
+#if defined (WIN32)
   // Since Windows has case-insensitive filenames, the preprocessor,
   // when searching using a provided relative path, will sometimes
   // capitalize the first letter of the last segment of a path name
diff --git a/TAO/TAO_IDL/fe/idl.ll b/TAO/TAO_IDL/fe/idl.ll
index 7b3dbdfa9fb..a07db882427 100644
--- a/TAO/TAO_IDL/fe/idl.ll
+++ b/TAO/TAO_IDL/fe/idl.ll
@@ -583,20 +583,6 @@ idl_parse_line_and_file (char *buf)
         }
 
       h[i] = '\0';
-#if defined (ACE_OPENVMS)
-      // translate this into *nix format as the OpenVMS preprocessor
-      // possibly produced VMS-style paths here.
-      char trans_path[MAXPATHLEN] = "";
-      char *temp_h = IDL_GlobalData::translateName (h, trans_path);
-      if (temp_h)
-        h = temp_h;
-      else
-        {
-          ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("Unable to construct full file pathname\n")));
-          throw Bailout ();
-        }
-#endif
       ACE_NEW (tmp,
                UTL_String (h, true));
       idl_global->update_prefix (tmp->get_string ());
@@ -615,21 +601,10 @@ idl_parse_line_and_file (char *buf)
 
   if (!is_real_filename)
     {
-#if defined (ACE_OPENVMS)
-      char full_path[MAXPATHLEN] = "";
-      char *full_fname = ACE_OS::realpath (fname->get_string (), full_path);
-      // I don't see the benefit of using ->compare since this is targeted at IDL identifiers
-      // not at filenames and in the case of OpenVMS (case-insensitive filesystem) gets really
-      // problematic as filenames retrieved through different mechanisms may give different
-      // casing.
-      is_main_filename = FE_Utils::path_cmp (idl_global->main_filename ()->get_string (),
-                                             full_fname) == 0;
-#else
       is_main_filename =
         fname->compare (idl_global->main_filename ())
         || same_file (fname->get_string (),
                       idl_global->main_filename ()->get_string ());
-#endif
     }
 
   if (is_real_filename || is_main_filename)
diff --git a/TAO/TAO_IDL/fe/idl.tab.cpp b/TAO/TAO_IDL/fe/idl.tab.cpp
index 4f8615a1a40..3273f214299 100644
--- a/TAO/TAO_IDL/fe/idl.tab.cpp
+++ b/TAO/TAO_IDL/fe/idl.tab.cpp
@@ -746,18 +746,6 @@ typedef int_least16_t yytype_int16;
 typedef short yytype_int16;
 #endif
 
-/* Work around bug in HP-UX 11.23, which defines these macros
-   incorrectly for preprocessor constants.  This workaround can likely
-   be removed in 2023, as HPE has promised support for HP-UX 11.23
-   (aka HP-UX 11i v2) only through the end of 2022; see Table 2 of
-   <https://h20195.www2.hpe.com/V2/getpdf.aspx/4AA4-7673ENW.pdf>.  */
-#ifdef __hpux
-# undef UINT_LEAST8_MAX
-# undef UINT_LEAST16_MAX
-# define UINT_LEAST8_MAX 255
-# define UINT_LEAST16_MAX 65535
-#endif
-
 #if defined __UINT_LEAST8_MAX__ && __UINT_LEAST8_MAX__ <= __INT_MAX__
 typedef __UINT_LEAST8_TYPE__ yytype_uint8;
 #elif (!defined __UINT_LEAST8_MAX__ && defined YY_STDINT_H \
diff --git a/TAO/TAO_IDL/fe/idl.yy.cpp b/TAO/TAO_IDL/fe/idl.yy.cpp
index 566e026cb55..e5546389c91 100644
--- a/TAO/TAO_IDL/fe/idl.yy.cpp
+++ b/TAO/TAO_IDL/fe/idl.yy.cpp
@@ -288,7 +288,7 @@
 
 /* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
 
-#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L || defined (__HP_aCC)
+#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
 
 /* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
  * if you want the limit (max/min) macros for int types.
@@ -3644,20 +3644,6 @@ idl_parse_line_and_file (char *buf)
         }
 
       h[i] = '\0';
-#if defined (ACE_OPENVMS)
-      // translate this into *nix format as the OpenVMS preprocessor
-      // possibly produced VMS-style paths here.
-      char trans_path[MAXPATHLEN] = "";
-      char *temp_h = IDL_GlobalData::translateName (h, trans_path);
-      if (temp_h)
-        h = temp_h;
-      else
-        {
-          ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("Unable to construct full file pathname\n")));
-          throw Bailout ();
-        }
-#endif
       ACE_NEW (tmp,
                UTL_String (h, true));
       idl_global->update_prefix (tmp->get_string ());
@@ -3676,21 +3662,10 @@ idl_parse_line_and_file (char *buf)
 
   if (!is_real_filename)
     {
-#if defined (ACE_OPENVMS)
-      char full_path[MAXPATHLEN] = "";
-      char *full_fname = ACE_OS::realpath (fname->get_string (), full_path);
-      // I don't see the benefit of using ->compare since this is targeted at IDL identifiers
-      // not at filenames and in the case of OpenVMS (case-insensitive filesystem) gets really
-      // problematic as filenames retrieved through different mechanisms may give different
-      // casing.
-      is_main_filename = FE_Utils::path_cmp (idl_global->main_filename ()->get_string (),
-                                             full_fname) == 0;
-#else
       is_main_filename =
         fname->compare (idl_global->main_filename ())
         || same_file (fname->get_string (),
                       idl_global->main_filename ()->get_string ());
-#endif
     }
 
   if (is_real_filename || is_main_filename)