Fix compilation of new tracker for MinGW/MinGW64
authorAntony Riakiotakis <kalast@gmail.com>
Mon, 11 Jun 2012 13:00:35 +0000 (13:00 +0000)
committerAntony Riakiotakis <kalast@gmail.com>
Mon, 11 Jun 2012 13:00:35 +0000 (13:00 +0000)
extern/libmv/third_party/ceres/internal/ceres/collections_port.h
extern/libmv/third_party/ceres/patches/collections_port.h.mingw.patch [new file with mode: 0644]

index e125f3fffcd2fb0f3be17e6ed94649f80bcdb42b..55f725390237726d0e9ed8f32c3c872796d34543 100644 (file)
@@ -53,7 +53,7 @@ struct HashMap : tr1::unordered_map<K, V> {};
 template<typename K>
 struct HashSet : tr1::unordered_set<K> {};
 
 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
 #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 (file)
index 0000000..bbb366e
--- /dev/null
@@ -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