6 files changed, 8 insertions, 8 deletions
diff --git a/ACE/ace/SSL/SSL_Asynch_BIO.cpp b/ACE/ace/SSL/SSL_Asynch_BIO.cpp
index 64aa14c6ab9..0faa775fc0f 100644
--- a/ACE/ace/SSL/SSL_Asynch_BIO.cpp
+++ b/ACE/ace/SSL/SSL_Asynch_BIO.cpp
@@ -1,7 +1,7 @@
 // -*- C++ -*-
 #include "SSL_Asynch_BIO.h"
 
-#if OPENSSL_VERSION_NUMBER > 0x0090581fL && ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS)))
+#if OPENSSL_VERSION_NUMBER > 0x0090581fL && (defined (ACE_WIN32) || (defined (ACE_HAS_AIO_CALLS)))
 
 #include "SSL_Asynch_Stream.h"
 #include "ace/OS_NS_string.h"
diff --git a/ACE/ace/SSL/SSL_Asynch_BIO.h b/ACE/ace/SSL/SSL_Asynch_BIO.h
index 70b1a0fcc00..1d5aec2ff5d 100644
--- a/ACE/ace/SSL/SSL_Asynch_BIO.h
+++ b/ACE/ace/SSL/SSL_Asynch_BIO.h
@@ -25,7 +25,7 @@
 
 #include <openssl/bio.h>
 
-#if OPENSSL_VERSION_NUMBER > 0x0090581fL && ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS)))
+#if OPENSSL_VERSION_NUMBER > 0x0090581fL && (defined (ACE_WIN32) || (defined (ACE_HAS_AIO_CALLS)))
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 extern BIO * ACE_SSL_make_BIO (void * ssl_asynch_stream);
diff --git a/ACE/ace/SSL/SSL_Asynch_Stream.cpp b/ACE/ace/SSL/SSL_Asynch_Stream.cpp
index a673b6f371a..ed5a1e1f440 100644
--- a/ACE/ace/SSL/SSL_Asynch_Stream.cpp
+++ b/ACE/ace/SSL/SSL_Asynch_Stream.cpp
@@ -1,7 +1,7 @@
 #include "SSL_Asynch_Stream.h"
 
 // This only works on platforms with Asynchronous IO support.
-#if OPENSSL_VERSION_NUMBER > 0x0090581fL && ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS)))
+#if OPENSSL_VERSION_NUMBER > 0x0090581fL && (defined (ACE_WIN32) || (defined (ACE_HAS_AIO_CALLS)))
 
 #if defined (ACE_WIN32)
 # include "ace/WIN32_Proactor.h"
diff --git a/ACE/ace/SSL/SSL_Asynch_Stream.h b/ACE/ace/SSL/SSL_Asynch_Stream.h
index 39fb2bb46e2..db86bf1f9f8 100644
--- a/ACE/ace/SSL/SSL_Asynch_Stream.h
+++ b/ACE/ace/SSL/SSL_Asynch_Stream.h
@@ -18,7 +18,7 @@
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#if OPENSSL_VERSION_NUMBER > 0x0090581fL && ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS)))
+#if OPENSSL_VERSION_NUMBER > 0x0090581fL && (defined (ACE_WIN32) || (defined (ACE_HAS_AIO_CALLS)))
 
 #include "SSL_Asynch_BIO.h"
 
diff --git a/ACE/ace/SSL/SSL_Context.cpp b/ACE/ace/SSL/SSL_Context.cpp
index 09020466e73..9313dc5717f 100644
--- a/ACE/ace/SSL/SSL_Context.cpp
+++ b/ACE/ace/SSL/SSL_Context.cpp
@@ -516,10 +516,10 @@ 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)
+#  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/SSL/SSL_Context.h b/ACE/ace/SSL/SSL_Context.h
index 97eae945e62..91903f788c3 100644
--- a/ACE/ace/SSL/SSL_Context.h
+++ b/ACE/ace/SSL/SSL_Context.h
@@ -57,7 +57,7 @@ private:
 
 // ****************************************************************
 
-// NOTE: Solaris studio compilers amongst others will issue warnings if the
+// NOTE: Some compilers will issue warnings if the
 // the correct type of function pointer (i.e. extern "C" ) is not stored/used
 // of the form:
 // Warning (Anachronism): Formal argument callback of type