diff options
| author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-06-09 21:41:40 -0300 |
|---|---|---|
| committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-06-09 21:41:40 -0300 |
| commit | d348f1219feba75e0200d2797944edd945b586f7 (patch) | |
| tree | 7251dc68a415c8f5cd31d71bf6b87310ae61ba28 | |
| parent | fdbef84347f775c7a2ce44ef41a744df5201f4e0 (diff) | |
| parent | 2c8fd5fae86ffc41865ac4977760c26ddd6bf436 (diff) | |
| download | mariadb-git-d348f1219feba75e0200d2797944edd945b586f7.tar.gz | |
Merge of mysql-5.1-bugteam into mysql-trunk-merge.
| -rw-r--r-- | extra/yassl/include/lock.hpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/extra/yassl/include/lock.hpp b/extra/yassl/include/lock.hpp index 7ce656522df..99829b0b6de 100644 --- a/extra/yassl/include/lock.hpp +++ b/extra/yassl/include/lock.hpp @@ -23,13 +23,21 @@ #ifndef yaSSL_LOCK_HPP #define yaSSL_LOCK_HPP +/* + Visual Studio Source Annotations header (sourceannotations.h) fails + to compile if outside of the global namespace. +*/ +#ifdef YASSL_THREAD_SAFE +#ifdef _WIN32 +#include <windows.h> +#endif +#endif namespace yaSSL { #ifdef YASSL_THREAD_SAFE #ifdef _WIN32 - #include <windows.h> class Mutex { CRITICAL_SECTION cs_; |