diff options
| author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-06-09 21:36:20 -0300 |
|---|---|---|
| committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-06-09 21:36:20 -0300 |
| commit | 34ceaa6a3d030c25500e7e39e95ca92d0f1448b4 (patch) | |
| tree | 5d38c809cf6dc4714834c80ead4701483e754dee /extra | |
| parent | 04f4786c081d4aa09ae91692bc494c8fd3cc3430 (diff) | |
| parent | 41297909aded820350afaecf64a4aee888bd369c (diff) | |
| download | mariadb-git-34ceaa6a3d030c25500e7e39e95ca92d0f1448b4.tar.gz | |
Merge of mysql-5.0-bugteam into mysql-5.1-bugteam.
Diffstat (limited to 'extra')
| -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_; |