From 9941cf7c955284eeb8feb870e238f1b72c45748b Mon Sep 17 00:00:00 2001
From: Andrey Kamaev <no@email>
Date: Tue, 27 Mar 2012 23:17:53 +0000
Subject: [PATCH] Fixed MSCV2005 build with TBB enabled.

---
 modules/core/include/opencv2/core/operations.hpp |  5 ++++-
 modules/highgui/src/precomp.hpp                  | 15 +++++----------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/modules/core/include/opencv2/core/operations.hpp b/modules/core/include/opencv2/core/operations.hpp
index e493bfa..035ed47 100644
--- a/modules/core/include/opencv2/core/operations.hpp
+++ b/modules/core/include/opencv2/core/operations.hpp
@@ -76,7 +76,10 @@
   #endif
     
 #elif defined WIN32 || defined _WIN32
-  #define WIN32_MEAN_AND_LEAN 
+  #define WIN32_MEAN_AND_LEAN
+  #ifndef _WIN32_WINNT           // This is needed for the declaration of TryEnterCriticalSection in winbase.h with Visual Studio 2005 (and older?)
+    #define _WIN32_WINNT 0x0400  // http://msdn.microsoft.com/en-us/library/ms686857(VS.85).aspx
+  #endif
   #include <windows.h>
   #undef min
   #undef max
diff --git a/modules/highgui/src/precomp.hpp b/modules/highgui/src/precomp.hpp
index 8c41954..415f5e8 100644
--- a/modules/highgui/src/precomp.hpp
+++ b/modules/highgui/src/precomp.hpp
@@ -48,21 +48,16 @@
 
 #include "cvconfig.h"
 
-#if defined WIN32 || defined _WIN32
-
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#undef min
-#undef max
-
-void  FillBitmapInfo( BITMAPINFO* bmi, int width, int height, int bpp, int origin );
-#endif
-
 #include "opencv2/highgui/highgui.hpp"
 #include "opencv2/highgui/highgui_c.h"
 #include "opencv2/imgproc/imgproc_c.h"
 #include "opencv2/core/internal.hpp"
 
+#if defined WIN32 || defined _WIN32
+//required windows.h has to be included by the opencv2/core/internal.hpp
+void  FillBitmapInfo( BITMAPINFO* bmi, int width, int height, int bpp, int origin );
+#endif
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-- 
2.7.4