From d2083b06718aaf20aaca693a9729746968495bec Mon Sep 17 00:00:00 2001
From: Marco Serantoni <marco.serantoni@gmail.com>
Date: Sun, 27 Apr 2014 16:28:37 +0200
Subject: [PATCH] [MacOSX] Fix for name collision with OSX headers, Maciej,
 Tomasz or others feel free to rework if you want/like

---
 include/geometry/rtree.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/geometry/rtree.h b/include/geometry/rtree.h
index 6d5a5561d7..4ae5fafae6 100644
--- a/include/geometry/rtree.h
+++ b/include/geometry/rtree.h
@@ -32,10 +32,10 @@
 
 #define ASSERT assert    // RTree uses ASSERT( condition )
 #ifndef Min
-  #define Min std::min
+  #define rMin std::min
 #endif    // Min
 #ifndef Max
-  #define Max std::max
+  #define rMax std::max
 #endif    // Max
 
 //
@@ -1326,8 +1326,8 @@ typename RTREE_QUAL::Rect RTREE_QUAL::CombineRect( Rect* a_rectA, Rect* a_rectB
 
     for( int index = 0; index < NUMDIMS; ++index )
     {
-        newRect.m_min[index]    = Min( a_rectA->m_min[index], a_rectB->m_min[index] );
-        newRect.m_max[index]    = Max( a_rectA->m_max[index], a_rectB->m_max[index] );
+        newRect.m_min[index]    = rMin( a_rectA->m_min[index], a_rectB->m_min[index] );
+        newRect.m_max[index]    = rMax( a_rectA->m_max[index], a_rectB->m_max[index] );
     }
 
     return newRect;