[Rcpp-commits] r4209 - in pkg/Rcpp: . src

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

Author: jjallaire
Date: 2013-01-14 17:22:25 +0100 (Mon, 14 Jan 2013)
New Revision: 4209

Modified:
   pkg/Rcpp/ChangeLog
   pkg/Rcpp/src/Timer.cpp
Log:
fix OSX build (remove __MACH__ define check)

Modified: pkg/Rcpp/ChangeLog
===================================================================
--- pkg/Rcpp/ChangeLog	2013-01-14 15:38:05 UTC (rev 4208)
+++ pkg/Rcpp/ChangeLog	2013-01-14 16:22:25 UTC (rev 4209)
@@ -3,6 +3,7 @@
         * R/Attributes.R: handle build paths with spaces on windows
         * R/RcppLdpath.R: handle build paths with spaces on windows
         * R/tools.R: handle build paths with spaces on windows
+        * src/Timer.cpp: fix OSX build (remove __MACH__ define check)
         * R/: set svn eol-style native for source files
         * src/: set svn eol-style native for source files 
         * inst/include/: set svn eol-style native for source files 

Modified: pkg/Rcpp/src/Timer.cpp
===================================================================
--- pkg/Rcpp/src/Timer.cpp	2013-01-14 15:38:05 UTC (rev 4208)
+++ pkg/Rcpp/src/Timer.cpp	2013-01-14 16:22:25 UTC (rev 4209)
@@ -25,7 +25,7 @@
 #if defined(_WIN32) 
     #define WIN32_LEAN_AND_MEAN
     #include <windows.h>
-#elif defined(__APPLE__) && defined(__MACH___)
+#elif defined(__APPLE__)
     #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__) && defined(__MACH__)
+#elif defined(__APPLE__)
      
     nanotime_t get_nanotime(void) {
         nanotime_t time;