1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bug#34236: Various possibly related SSL crashes

Browse Source 
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.
This commit is contained in:
Davi Arnaut 2010-06-09 21:30:41 -03:00
parent 51e90dc79e
commit 41297909ad
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
extra/yassl/include/lock.hpp
View File

@ -23,13 +23,21 @@
#ifndef yaSSL_LOCK_HPP #ifndef yaSSL_LOCK_HPP
#define 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 { namespace yaSSL {
#ifdef YASSL_THREAD_SAFE #ifdef YASSL_THREAD_SAFE
#ifdef _WIN32 #ifdef _WIN32
#include <windows.h>
class Mutex { class Mutex {
CRITICAL_SECTION cs_; CRITICAL_SECTION cs_;