Mingw64 defines _I64_MAX in limits.h

diff --git a/modules/access/bda/bda.h b/modules/access/bda/bda.h
index 8f4d37ba0aabd9ede00d2985d31e427386fa67a4..9547cae15db6cdb91fe71e811d1cecaea81ad7f2 100644 (file)
--- a/modules/access/bda/bda.h
+++ b/modules/access/bda/bda.h
@@ -48,7 +48,9 @@
 #   define AM_NOVTABLE
 #   define _OBJBASE_H_
 #   undef _X86_
-#   define _I64_MAX LONG_LONG_MAX
+#   ifndef _I64_MAX
+#     define _I64_MAX LONG_LONG_MAX
+#   endif
 #   define LONGLONG long long
 #endif
 

diff --git a/modules/access/dshow/common.h b/modules/access/dshow/common.h
index 098f51cab2417f570514ca158842def1a912b8ad..136375deea15e78be64ceb7646471437979fd6d7 100644 (file)
--- a/modules/access/dshow/common.h
+++ b/modules/access/dshow/common.h
@@ -41,7 +41,9 @@ using namespace std;
 #   define AM_NOVTABLE
 #   define _OBJBASE_H_
 #   undef _X86_
-#   define _I64_MAX LONG_LONG_MAX
+#   ifndef _I64_MAX
+#     define _I64_MAX LONG_LONG_MAX
+#   endif
 #   define LONGLONG long long
 #endif
 

diff --git a/modules/access/dshow/filter.h b/modules/access/dshow/filter.h
index 73bea53f6f9883ac0487bdde561375677efbcbb8..85951f09a76aa018ab309977fc28fc343257f6fb 100644 (file)
--- a/modules/access/dshow/filter.h
+++ b/modules/access/dshow/filter.h
@@ -41,7 +41,9 @@ using namespace std;
 #   define AM_NOVTABLE
 #   define _OBJBASE_H_
 #   undef _X86_
-#   define _I64_MAX LONG_LONG_MAX
+#   ifndef _I64_MAX
+#     define _I64_MAX LONG_LONG_MAX
+#   endif
 #   define LONGLONG long long
 #endif