diff options
| -rw-r--r-- | extern/libmv/third_party/ceres/internal/ceres/collections_port.h | 2 | ||||
| -rw-r--r-- | extern/libmv/third_party/ceres/patches/collections_port.h.mingw.patch | 13 |
2 files changed, 14 insertions, 1 deletions
diff --git a/extern/libmv/third_party/ceres/internal/ceres/collections_port.h b/extern/libmv/third_party/ceres/internal/ceres/collections_port.h index e125f3fffcd..55f72539023 100644 --- a/extern/libmv/third_party/ceres/internal/ceres/collections_port.h +++ b/extern/libmv/third_party/ceres/internal/ceres/collections_port.h @@ -53,7 +53,7 @@ struct HashMap : tr1::unordered_map<K, V> {}; template<typename K> struct HashSet : tr1::unordered_set<K> {}; -#ifdef _WIN32 +#if defined(_WIN32) && !defined(__MINGW64__) && !defined(__MINGW32__) #define GG_LONGLONG(x) x##I64 #define GG_ULONGLONG(x) x##UI64 #else diff --git a/extern/libmv/third_party/ceres/patches/collections_port.h.mingw.patch b/extern/libmv/third_party/ceres/patches/collections_port.h.mingw.patch new file mode 100644 index 00000000000..bbb366e22bc --- /dev/null +++ b/extern/libmv/third_party/ceres/patches/collections_port.h.mingw.patch @@ -0,0 +1,13 @@ +Index: internal/ceres/collections_port.h +=================================================================== +--- internal/ceres/collections_port.h (revision 47730) ++++ internal/ceres/collections_port.h (working copy) +@@ -53,7 +53,7 @@ + template<typename K> + struct HashSet : tr1::unordered_set<K> {}; + +-#ifdef _WIN32 ++#if defined(_WIN32) && !defined(__MINGW64__) && !defined(__MINGW32__) + #define GG_LONGLONG(x) x##I64 + #define GG_ULONGLONG(x) x##UI64 + #else |