summaryrefslogtreecommitdiff
path: root/ACE/ace
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2023-01-15 10:34:15 +0100
committerJohnny Willemsen <jwillemsen@remedy.nl>2023-01-15 10:34:15 +0100
commit0a572bec8848eabb70c652fffa043ec335f45454 (patch)
tree54c3f8d4f6e58c28525d28605af31c3669c7abf8 /ACE/ace
parent54ee4626edad4d98513a330beb2acf4a3a0596b7 (diff)
downloadATCD-0a572bec8848eabb70c652fffa043ec335f45454.tar.gz
Removed some OpenVMS code
* ACE/ace/SSL/SSL_Context.cpp: * ACE/ace/Sock_Connect.cpp: * TAO/TAO-INSTALL.html:
Diffstat (limited to 'ACE/ace')
-rw-r--r--ACE/ace/SSL/SSL_Context.cpp4
-rw-r--r--ACE/ace/Sock_Connect.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/ACE/ace/SSL/SSL_Context.cpp b/ACE/ace/SSL/SSL_Context.cpp
index 44fea0d26bc..9313dc5717f 100644
--- a/ACE/ace/SSL/SSL_Context.cpp
+++ b/ACE/ace/SSL/SSL_Context.cpp
@@ -519,7 +519,7 @@ ACE_SSL_Context::load_trusted_ca (const char* ca_file,
// 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)
+# if !defined (OPENSSL_SYS_MACINTOSH_CLASSIC)
# if !defined (OPENSSL_SYS_WIN32)
if (ca_dir != 0)
@@ -542,7 +542,7 @@ ACE_SSL_Context::load_trusted_ca (const char* ca_file,
}
}
# endif /* !OPENSSL_SYS_WIN32 */
-# endif /* !OPENSSL_SYS_VMS && !OPENSSL_SYS_MACINTOSH_CLASSIC */
+# endif /* !OPENSSL_SYS_MACINTOSH_CLASSIC */
#endif /* OPENSSL_VERSION_NUMBER >= 0.9.8a release */
}
diff --git a/ACE/ace/Sock_Connect.cpp b/ACE/ace/Sock_Connect.cpp
index 32df890caa1..c60e324c358 100644
--- a/ACE/ace/Sock_Connect.cpp
+++ b/ACE/ace/Sock_Connect.cpp
@@ -1222,7 +1222,7 @@ ACE::count_interfaces (ACE_HANDLE handle, size_t &how_many)
# endif /* SIOCGLIFNUM */
return 0;
-#elif (defined (__unix) || defined (__unix__) || defined (ACE_OPENVMS) || defined (ACE_HAS_RTEMS) || (defined (ACE_VXWORKS) && !defined (ACE_HAS_GETIFADDRS))) && !defined (ACE_LACKS_NETWORKING)
+#elif (defined (__unix) || defined (__unix__) || defined (ACE_HAS_RTEMS) || (defined (ACE_VXWORKS) && !defined (ACE_HAS_GETIFADDRS))) && !defined (ACE_LACKS_NETWORKING)
// Note: DEC CXX doesn't define "unix". BSD compatible OS: HP UX,
// AIX, SunOS 4.x perform some ioctls to retrieve ifconf list of
// ifreq structs no SIOCGIFNUM on SunOS 4.x, so use guess and scan