Merge of mysql-5.1-bugteam into mysql-trunk-merge.

d348f121 · Davi Arnaut · fdbef843 · 2c8fd5fa · d348f121
Commit d348f121 authored Jun 09, 2010 by Davi Arnaut
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 1 deletion

extra/yassl/include/lock.hpp extra/yassl/include/lock.hpp +9 -1

No files found.
--- 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_;