diff options
| author | unknown <svoj@mysql.com> | 2005-06-16 16:35:09 +0500 |
|---|---|---|
| committer | unknown <svoj@mysql.com> | 2005-06-16 16:35:09 +0500 |
| commit | 0dabdf15a7f8d75eddc11f53f8ef87de3783b72d (patch) | |
| tree | c92c38ffa34a246fd7cbc247a2d6dc5f7628263e /extra/yassl/include | |
| parent | fc465d1497ce598d07ec75eeaafc7ca84b578ee6 (diff) | |
| download | mariadb-git-0dabdf15a7f8d75eddc11f53f8ef87de3783b72d.tar.gz | |
WL#2286 - Compile MySQL w/YASSL support
Merge with latest yaSSL.
extra/yassl/include/lock.hpp:
Merge with latest yaSSL.
extra/yassl/include/socket_wrapper.hpp:
Merge with latest yaSSL.
extra/yassl/mySTL/helpers.hpp:
Merge with latest yaSSL.
extra/yassl/src/lock.cpp:
Merge with latest yaSSL.
extra/yassl/src/log.cpp:
Merge with latest yaSSL.
extra/yassl/src/socket_wrapper.cpp:
Merge with latest yaSSL.
extra/yassl/src/ssl.cpp:
Merge with latest yaSSL.
extra/yassl/src/timer.cpp:
Merge with latest yaSSL.
extra/yassl/taocrypt/include/misc.hpp:
Merge with latest yaSSL.
extra/yassl/taocrypt/include/random.hpp:
Merge with latest yaSSL.
extra/yassl/taocrypt/include/types.hpp:
Merge with latest yaSSL.
extra/yassl/taocrypt/src/asn.cpp:
Merge with latest yaSSL.
extra/yassl/taocrypt/src/integer.cpp:
Merge with latest yaSSL.
extra/yassl/taocrypt/src/misc.cpp:
Merge with latest yaSSL.
extra/yassl/taocrypt/src/random.cpp:
Merge with latest yaSSL.
Diffstat (limited to 'extra/yassl/include')
| -rw-r--r-- | extra/yassl/include/lock.hpp | 6 | ||||
| -rw-r--r-- | extra/yassl/include/socket_wrapper.hpp | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/extra/yassl/include/lock.hpp b/extra/yassl/include/lock.hpp index 11a623879d4..f5231528821 100644 --- a/extra/yassl/include/lock.hpp +++ b/extra/yassl/include/lock.hpp @@ -31,7 +31,7 @@ namespace yaSSL { #ifdef MULTI_THREADED - #ifdef WIN32 + #ifdef _WIN32 #include <windows.h> class Mutex { @@ -50,7 +50,7 @@ namespace yaSSL { ~Lock(); }; }; - #else // WIN32 + #else // _WIN32 #include <pthread.h> class Mutex { @@ -71,7 +71,7 @@ namespace yaSSL { }; }; - #endif // WIN32 + #endif // _WIN32 #else // MULTI_THREADED (WE'RE SINGLE) class Mutex { diff --git a/extra/yassl/include/socket_wrapper.hpp b/extra/yassl/include/socket_wrapper.hpp index a103cca1b37..38a9ce3bd25 100644 --- a/extra/yassl/include/socket_wrapper.hpp +++ b/extra/yassl/include/socket_wrapper.hpp @@ -31,7 +31,7 @@ #include <assert.h> -#ifdef WIN32 +#ifdef _WIN32 #include <winsock2.h> #else #include <sys/time.h> @@ -47,7 +47,7 @@ namespace yaSSL { typedef unsigned int uint; -#ifdef WIN32 +#ifdef _WIN32 typedef SOCKET socket_t; #else typedef int socket_t; |