Merge ktlim@zizzer.eecs.umich.edu:/bk/m5

[gem5.git] / base / intmath.hh

diff --git a/base/intmath.hh b/base/intmath.hh
index fc28eecef0df6f2c4eb1a5ce002537b457a70f74..5ffe2710393c78cd5d746f4e3a60f42f6d19caf0 100644 (file)
--- a/base/intmath.hh
+++ b/base/intmath.hh
@@ -119,6 +119,7 @@ FloorLog2(int64_t x)
     return FloorLog2((uint64_t)x);
 }
 
+#if defined(__APPLE__)
 inline int
 FloorLog2(size_t x)
 {
@@ -132,6 +133,7 @@ FloorLog2(size_t x)
         return FloorLog2((uint64_t)x);
 
 }
+#endif
 
 template <class T>
 inline int