From 0db2549775ea252ab92c999fd557f9965286cb91 Mon Sep 17 00:00:00 2001 From: Gacko Date: Tue, 21 Jan 2014 22:33:53 +0100 Subject: [PATCH] Dep: Rename custom typedef to prevent redefinition under Mac OS --- dep/recastnavigation/Detour/DetourNavMesh.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dep/recastnavigation/Detour/DetourNavMesh.h b/dep/recastnavigation/Detour/DetourNavMesh.h index c094e4134d..9c61a9bb64 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 #ifndef uint64_t @@ -33,7 +34,8 @@ typedef unsigned __int64 uint64; #include #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