Merge pull request #947 from alalek:c_defines

modules/line_descriptor/src/precomp.hpp

@@ -46,7 +46,9 @@
 #pragma warning( disable : 4267 )
 #endif
 
+#ifndef _USE_MATH_DEFINES
 #define _USE_MATH_DEFINES
+#endif
 
 #include <algorithm>
 #include "opencv2/core/utility.hpp"

modules/reg/samples/map_test.cpp

@@ -36,12 +36,9 @@
 //M*/
 
 #include <iostream>
-#define _USE_MATH_DEFINES
-#include <cmath>
 #include <opencv2/imgcodecs.hpp>
 #include <opencv2/highgui.hpp> // OpenCV window I/O
 #include <opencv2/imgproc.hpp> // OpenCV image transformations
-#include <opencv2/imgproc.hpp>
 #include <opencv2/imgproc/types_c.h>
 #include <opencv2/imgcodecs/imgcodecs_c.h>
 #include <opencv2/highgui/highgui_c.h>

modules/text/src/erfilter.cpp

@@ -51,7 +51,9 @@
     typedef int int_fast32_t;
 #else
     #ifndef INT32_MAX
+    #ifndef __STDC_LIMIT_MACROS
     #define __STDC_LIMIT_MACROS
+    #endif
     #include <stdint.h>
     #endif
 #endif