diff options
| author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-06-08 18:14:18 -0300 |
|---|---|---|
| committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-06-08 18:14:18 -0300 |
| commit | 1de997d849e718a7080cf5eab6f8715beada8abf (patch) | |
| tree | 0699584297a9aa3c81ff88503dfb377f2d99610f /extra/yassl/include/lock.hpp | |
| parent | 8f4a33732a0b5eeb4c5022403bc5fc45c9193b49 (diff) | |
| parent | 514e407c44e408ac120e5053b8fc4651f1cb089c (diff) | |
| download | mariadb-git-1de997d849e718a7080cf5eab6f8715beada8abf.tar.gz | |
Merge of mysql-5.0-bugteam into mysql-5.1-bugteam.
Diffstat (limited to 'extra/yassl/include/lock.hpp')
| -rw-r--r-- | extra/yassl/include/lock.hpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/extra/yassl/include/lock.hpp b/extra/yassl/include/lock.hpp index 0525943e45d..7ce656522df 100644 --- a/extra/yassl/include/lock.hpp +++ b/extra/yassl/include/lock.hpp @@ -27,7 +27,7 @@ namespace yaSSL { -#ifdef MULTI_THREADED +#ifdef YASSL_THREAD_SAFE #ifdef _WIN32 #include <windows.h> @@ -69,7 +69,7 @@ namespace yaSSL { }; #endif // _WIN32 -#else // MULTI_THREADED (WE'RE SINGLE) +#else // YASSL_THREAD_SAFE (WE'RE SINGLE) class Mutex { public: @@ -79,7 +79,7 @@ namespace yaSSL { }; }; -#endif // MULTI_THREADED +#endif // YASSL_THREAD_SAFE |