aboutsummaryrefslogtreecommitdiff
path: root/dep
diff options
context:
space:
mode:
authorGacko <Gacko@users.noreply.github.com>2014-01-22 22:05:48 +0100
committerGacko <Gacko@users.noreply.github.com>2014-01-22 22:05:48 +0100
commit9fbca6e3a3281428f1f852271c226d5fdb6430b5 (patch)
tree9e9fe2bc1bea62a77911ed1c281a97508379e292 /dep
parent678814836d215580e138e69cd334b4f35ed94270 (diff)
Dep/Recast: Add diff file for previous commit
Diffstat (limited to 'dep')
-rw-r--r--dep/recastnavigation/recast_hotfix2.diff38
1 files changed, 38 insertions, 0 deletions
diff --git a/dep/recastnavigation/recast_hotfix2.diff b/dep/recastnavigation/recast_hotfix2.diff
new file mode 100644
index 00000000000..cd73165dcb7
--- /dev/null
+++ b/dep/recastnavigation/recast_hotfix2.diff
@@ -0,0 +1,38 @@
+diff --git a/dep/recastnavigation/Detour/DetourNavMesh.h b/dep/recastnavigation/Detour/DetourNavMesh.h
+index c094e41..9c61a9b 100644
+--- a/dep/recastnavigation/Detour/DetourNavMesh.h
++++ b/dep/recastnavigation/Detour/DetourNavMesh.h
+@@ -25,7 +25,8 @@
+
+ // Edited by TC
+ #if defined(WIN32) && !defined(__MINGW32__)
+-typedef unsigned __int64 uint64;
++/// Do not rename back to uint64. Otherwise mac complains about typedef redefinition
++typedef unsigned __int64 uint64_d;
+ #else
+ #include <stdint.h>
+ #ifndef uint64_t
+@@ -33,7 +34,8 @@ typedef unsigned __int64 uint64;
+ #include <linux/types.h>
+ #endif
+ #endif
+-typedef uint64_t uint64;
++/// Do not rename back to uint64. Otherwise mac complains about typedef redefinition
++typedef uint64_t uint64_d;
+ #endif
+
+ // Note: If you want to use 64-bit refs, change the types of both dtPolyRef & dtTileRef.
+@@ -48,11 +50,11 @@ static const int STATIC_POLY_BITS = 31;
+
+ /// A handle to a polygon within a navigation mesh tile.
+ /// @ingroup detour
+-typedef uint64 dtPolyRef; // Edited by TC
++typedef uint64_d dtPolyRef; // Edited by TC
+
+ /// A handle to a tile within a navigation mesh.
+ /// @ingroup detour
+-typedef uint64 dtTileRef; // Edited by TC
++typedef uint64_d dtTileRef; // Edited by TC
+
+ /// The maximum number of vertices per navigation polygon.
+ /// @ingroup detour