Fix openexr build on MinGW
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Sat, 25 Aug 2012 14:13:59 +0000 (18:13 +0400)
committerAndrey Kamaev <andrey.kamaev@itseez.com>
Sun, 2 Sep 2012 16:44:09 +0000 (20:44 +0400)
3rdparty/openexr/IlmImf/ImfAutoArray.h
modules/highgui/src/grfmt_exr.cpp

index edb8b10..555205b 100644 (file)
 
 #include "OpenEXRConfig.h"
 
+#if !defined (HAVE_LARGE_STACK)
+#include <string.h>
+#endif
+
 namespace Imf {
 
 
index f01f1fd..9697cbc 100644 (file)
@@ -56,7 +56,7 @@
 #include <half.h>
 #include "grfmt_exr.hpp"
 
-#if defined _MSC_VER && _MSC_VER >= 1200
+#if defined _WIN32
 
 #undef UINT
 #define UINT ((Imf::PixelType)0)