eliminating VS2013 build warnings

f9aa148b · Andrey Pavlenko · 24be7b26 · f9aa148b · f9aa148b
Commit f9aa148b authored Dec 26, 2013 by Andrey Pavlenko
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 0 deletions

window_w32.cpp modules/highgui/src/window_w32.cpp +3 -0

cv2.cpp modules/python/src2/cv2.cpp +5 -0

No files found.
--- a/modules/highgui/src/window_w32.cpp
+++ b/modules/highgui/src/window_w32.cpp
@@ -61,7 +61,10 @@
 #ifdef __GNUC__
 #  pragma GCC diagnostic ignored "-Wmissing-declarations"
 #endif
+
+#if defined(_MSC_VER) && (_MSC_VER < 1700)
 #include <MultiMon.h>
+#endif

 #include <commctrl.h>
 #include <winuser.h>

--- a/modules/python/src2/cv2.cpp
+++ b/modules/python/src2/cv2.cpp
+#if defined(_MSC_VER) && (_MSC_VER >= 1800)
+// eliminating duplicated round() declaration
+#define HAVE_ROUND
+#endif
+
 #include <Python.h>

 #if !PYTHON_USE_NUMPY