build: fix defines

7 years ago · e878ea952a
parent 09c3be3f0f
commit e878ea952a
3 changed files with 5 additions and 2 deletions
--- a/modules/saliency/src/BING/kyheader.hpp
+++ b/modules/saliency/src/BING/kyheader.hpp
@ -78,7 +78,10 @@ typedef void *HANDLE;
 #ifndef _MSC_VER
 typedef unsigned char BYTE;
 #else
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
+#undef min
+#undef max
 #endif

 typedef std::vector<int> vecI;
--- a/modules/sfm/src/libmv_light/libmv/numeric/numeric.h
+++ b/modules/sfm/src/libmv_light/libmv/numeric/numeric.h
@ -43,7 +43,7 @@ static void sincos(double x, double *sinx, double *cosx) {
 #  endif
 #endif  // !__MINGW64__

-#if (defined(WIN32) || defined(WIN64)) && !defined(__MINGW32__)
+#if (defined(_WIN32)) && !defined(__MINGW32__)
 inline long lround(double d) {
  return (long)(d>0 ? d+0.5 : ceil(d-0.5));
 }
--- a/modules/xfeatures2d/samples/bagofwords_classification.cpp
+++ b/modules/xfeatures2d/samples/bagofwords_classification.cpp
@ -14,7 +14,7 @@
 #include <memory>
 #include <functional>

-#if defined WIN32 || defined _WIN32
+#ifdef _WIN32
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #undef min