diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-11-03 12:28:51 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-11-03 12:28:51 +0100 |
| commit | 40e94a3734b1daa254810c4be64e17b84dbbc2a2 (patch) | |
| tree | 5e14dfc106276445caf85dc76c8034c8b0df11b4 /extra/yassl/include | |
| parent | 247e654fa7e04dd0c5181c2241470f56749d2a99 (diff) | |
| parent | 4ffc9c3b01459a2904a7154a6c750d128864fc7b (diff) | |
| download | mariadb-git-40e94a3734b1daa254810c4be64e17b84dbbc2a2.tar.gz | |
merge with 5.5
Diffstat (limited to 'extra/yassl/include')
| -rw-r--r-- | extra/yassl/include/lock.hpp | 9 | ||||
| -rw-r--r-- | extra/yassl/include/openssl/ssl.h | 2 | ||||
| -rw-r--r-- | extra/yassl/include/yassl_error.hpp | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/extra/yassl/include/lock.hpp b/extra/yassl/include/lock.hpp index ae875001633..487bedfcc70 100644 --- a/extra/yassl/include/lock.hpp +++ b/extra/yassl/include/lock.hpp @@ -27,7 +27,7 @@ Visual Studio Source Annotations header (sourceannotations.h) fails to compile if outside of the global namespace. */ -#ifdef YASSL_THREAD_SAFE +#ifdef MULTI_THREADED #ifdef _WIN32 #include <windows.h> #endif @@ -36,8 +36,9 @@ namespace yaSSL { -#ifdef YASSL_THREAD_SAFE +#ifdef MULTI_THREADED #ifdef _WIN32 + #include <windows.h> class Mutex { CRITICAL_SECTION cs_; @@ -77,7 +78,7 @@ namespace yaSSL { }; #endif // _WIN32 -#else // YASSL_THREAD_SAFE (WE'RE SINGLE) +#else // MULTI_THREADED (WE'RE SINGLE) class Mutex { public: @@ -87,7 +88,7 @@ namespace yaSSL { }; }; -#endif // YASSL_THREAD_SAFE +#endif // MULTI_THREADED diff --git a/extra/yassl/include/openssl/ssl.h b/extra/yassl/include/openssl/ssl.h index 9104a2f501c..eaf7b0cd1fb 100644 --- a/extra/yassl/include/openssl/ssl.h +++ b/extra/yassl/include/openssl/ssl.h @@ -34,7 +34,7 @@ #include "rsa.h" -#define YASSL_VERSION "2.2.0" +#define YASSL_VERSION "2.2.2" #if defined(__cplusplus) diff --git a/extra/yassl/include/yassl_error.hpp b/extra/yassl/include/yassl_error.hpp index 87bb4c55e96..8efc7f72e87 100644 --- a/extra/yassl/include/yassl_error.hpp +++ b/extra/yassl/include/yassl_error.hpp @@ -65,7 +65,7 @@ enum YasslError { enum Library { yaSSL_Lib = 0, CryptoLib, SocketLib }; enum { MAX_ERROR_SZ = 80 }; -void SetErrorString(unsigned long, char*); +void SetErrorString(YasslError, char*); /* remove for now, if go back to exceptions use this wrapper // Base class for all yaSSL exceptions |