diff options
author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2001-07-14 06:10:27 +0000 |
---|---|---|
committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2001-07-14 06:10:27 +0000 |
commit | 49f3af985868d0d166b06a4d9aec16bbcbed50f3 (patch) | |
tree | 661ab7a043d6a1879afd5d21c561b14090e6cfd8 /ace/SSL | |
parent | 8b29c817b266087a3bfd9ad35aabee3c6c3d25a6 (diff) | |
download | ATCD-49f3af985868d0d166b06a4d9aec16bbcbed50f3.tar.gz |
ChangeLogTag:Fri Jul 13 23:02:46 2001 Ossama Othman <ossama@uci.edu>
Diffstat (limited to 'ace/SSL')
-rw-r--r-- | ace/SSL/SSL_Asynch_BIO.cpp | 9 | ||||
-rw-r--r-- | ace/SSL/SSL_Asynch_BIO.h | 5 | ||||
-rw-r--r-- | ace/SSL/SSL_Asynch_Stream.cpp | 5 | ||||
-rw-r--r-- | ace/SSL/SSL_Asynch_Stream.h | 7 |
4 files changed, 14 insertions, 12 deletions
diff --git a/ace/SSL/SSL_Asynch_BIO.cpp b/ace/SSL/SSL_Asynch_BIO.cpp index c4f87be8771..f55daf14e76 100644 --- a/ace/SSL/SSL_Asynch_BIO.cpp +++ b/ace/SSL/SSL_Asynch_BIO.cpp @@ -1,6 +1,5 @@ // -*- C++ -*- - #include "SSL_Asynch_BIO.h" #include "SSL_Asynch_Stream.h" @@ -8,7 +7,7 @@ ACE_RCSID (ACE_SSL, SSL_Asynch_BIO, "$Id$") -#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS)) +#if OPENSSL_VERSION_NUMBER > 0x0090581fL && ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS))) #define BIO_TYPE_ACE ( 21 | BIO_TYPE_SOURCE_SINK ) @@ -22,7 +21,8 @@ static BIO_METHOD methods_ACE = NULL, /* ACE_Asynch_BIO_gets, */ ACE_Asynch_BIO_ctrl, ACE_Asynch_BIO_new, - ACE_Asynch_BIO_free + ACE_Asynch_BIO_free, + NULL }; BIO_METHOD * @@ -195,4 +195,5 @@ ACE_Asynch_BIO_puts (BIO *pBIO, const char *str) return ACE_Asynch_BIO_write (pBIO, str, n); } -#endif /* ACE_WIN32 || ACE_HAS_AIO_CALLS*/ +#endif /* OPENSSL_VERSION_NUMBER > 0x0090581fL && (ACE_WIN32 || + ACE_HAS_AIO_CALLS) */ diff --git a/ace/SSL/SSL_Asynch_BIO.h b/ace/SSL/SSL_Asynch_BIO.h index 92fbdb4c110..d615db06b33 100644 --- a/ace/SSL/SSL_Asynch_BIO.h +++ b/ace/SSL/SSL_Asynch_BIO.h @@ -23,7 +23,7 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS)) +#if OPENSSL_VERSION_NUMBER > 0x0090581fL && ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS))) #include <openssl/bio.h> @@ -43,7 +43,8 @@ extern "C" } //@} -#endif /* ACE_WIN32 || ACE_HAS_AIO_CALLS */ +#endif /* OPENSSL_VERSION_NUMBER > 0x0090581fL (ACE_WIN32 || + ACE_HAS_AIO_CALLS) */ #include "ace/post.h" diff --git a/ace/SSL/SSL_Asynch_Stream.cpp b/ace/SSL/SSL_Asynch_Stream.cpp index 030506e12c2..d4b43e4ed0f 100644 --- a/ace/SSL/SSL_Asynch_Stream.cpp +++ b/ace/SSL/SSL_Asynch_Stream.cpp @@ -7,7 +7,7 @@ ACE_RCSID (ACE_SSL, "$Id$") // This only works on platforms with Asynchronous IO support. -#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS)) +#if OPENSSL_VERSION_NUMBER > 0x0090581fL && ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS))) #if defined (ACE_WIN32) @@ -1110,4 +1110,5 @@ ACE_SSL_Asynch_Stream::pending_BIO_count (void) return ret; } -#endif /* ACE_WIN32 || ACE_HAS_AIO_CALLS */ +#endif /* OPENSSL_VERSION_NUMBER > 0x0090581fL && (ACE_WIN32 || + ACE_HAS_AIO_CALLS) */ diff --git a/ace/SSL/SSL_Asynch_Stream.h b/ace/SSL/SSL_Asynch_Stream.h index 753998e0cb8..16470b1309e 100644 --- a/ace/SSL/SSL_Asynch_Stream.h +++ b/ace/SSL/SSL_Asynch_Stream.h @@ -21,9 +21,7 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS)) - -#include <openssl/err.h> +#if OPENSSL_VERSION_NUMBER > 0x0090581fL && ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS))) #include "ace/Asynch_IO_Impl.h" #include "ace/Message_Block.h" @@ -229,7 +227,8 @@ protected: }; -#endif /* ACE_WIN32 || ACE_HAS_AIO_CALLS */ +#endif /* OPENSSL_VERSION_NUMBER > 0x0090581fL && (ACE_WIN32 || + ACE_HAS_AIO_CALLS) */ #include "ace/post.h" |