eliminating VS2013 build warnings

2013-12-26 13:35:59 +04:00 · 2013-12-26 13:35:59 +04:00 · f9aa148ba9
commit f9aa148ba9
parent 24be7b26cd
2 changed files with 8 additions and 0 deletions
--- 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
@ -1,3 +1,8 @@
+#if defined(_MSC_VER) && (_MSC_VER >= 1800)
+// eliminating duplicated round() declaration
+#define HAVE_ROUND
+#endif
+
 #include <Python.h>

 #if !PYTHON_USE_NUMPY