[Rcpp-commits] r4190 - pkg/Rcpp/src

[noreply at r-forge.r-project.org]

Author: edd
Date: 2013-01-11 19:12:53 +0100 (Fri, 11 Jan 2013)
New Revision: 4190

Modified:
   pkg/Rcpp/src/Timer.cpp
Log:
one more refinedment: test for Apple && Mach (per Debian BTS thread)


Modified: pkg/Rcpp/src/Timer.cpp
===================================================================
--- pkg/Rcpp/src/Timer.cpp	2013-01-11 16:08:34 UTC (rev 4189)
+++ pkg/Rcpp/src/Timer.cpp	2013-01-11 18:12:53 UTC (rev 4190)
@@ -25,7 +25,7 @@
 #if defined(_WIN32) 
     #define WIN32_LEAN_AND_MEAN
     #include <windows.h>
-#elif defined(__APPLE__)
+#elif defined(__APPLE__) && defined(__MACH___)
     #include <mach/mach_time.h>
 #elif defined(linux) || defined(__linux) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__GLIBC__) || defined(__GNU__)
     #include <time.h>
@@ -49,7 +49,7 @@
         return 1.0e9 * time_var.QuadPart / frequency.QuadPart;
     }
 
-#elif defined(__APPLE__)
+#elif defined(__APPLE__) && defined(__MACH__)
      
     nanotime_t get_nanotime(void) {
         nanotime_t time;