Merge pull request #7295 from lupustr3:pvlasov/vs11_compat_fix

9 years ago · fb912e1ba7
parent 26ecf2f374 0a9470bf09
commit fb912e1ba7
1 changed files with 2 additions and 0 deletions
--- a/modules/core/src/ocl.cpp
+++ b/modules/core/src/ocl.cpp
@ -45,7 +45,9 @@
 #include <string>
 #include <sstream>
 #include <iostream> // std::cerr
+#if !(defined _MSC_VER) || (defined _MSC_VER && _MSC_VER > 1700)
 #include <inttypes.h>
+#endif

 #define CV_OPENCL_ALWAYS_SHOW_BUILD_LOG 0
 #define CV_OPENCL_SHOW_RUN_ERRORS       0