diff options
| author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-06-09 21:30:41 -0300 |
|---|---|---|
| committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-06-09 21:30:41 -0300 |
| commit | 41297909aded820350afaecf64a4aee888bd369c (patch) | |
| tree | 976f4904b4ac69a337f32a3d617f4f537fbdabf7 /extra | |
| parent | 51e90dc79e5b3847a8b1fdf69b8207864ff2f7c8 (diff) | |
| download | mariadb-git-41297909aded820350afaecf64a4aee888bd369c.tar.gz | |
Bug#34236: Various possibly related SSL crashes
Addendum: Work around a compilation failure on Windows due to
windows.h not being added to the global namespace.
extra/yassl/include/lock.hpp:
Move windows.h inclusion into the global namespace.
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_; |