Update to 2.0.0 tree from current Fremantle build

[opencv] / tests / cxcore / src / cxcoretest.h

diff --git a/tests/cxcore/src/cxcoretest.h b/tests/cxcore/src/cxcoretest.h
index 212b3fe..e528396 100644 (file)
--- a/tests/cxcore/src/cxcoretest.h
+++ b/tests/cxcore/src/cxcoretest.h
@@ -42,8 +42,10 @@
 #ifndef _CXCORE_TEST_H_
 #define _CXCORE_TEST_H_
 
-#if defined WIN32 || defined WIN64
+#if defined WIN32 || defined _WIN32 || defined WIN64 || defined _WIN64
 #include <windows.h>
+#undef min
+#undef max
 #endif
 
 #include "cxcore.h"