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

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

Author: edd
Date: 2012-12-28 02:25:54 +0100 (Fri, 28 Dec 2012)
New Revision: 4175

Modified:
   pkg/Rcpp/ChangeLog
   pkg/Rcpp/src/Timer.cpp
Log:
Applied patch kindly supplied by Rainer Hurling to support compilation on FreeBSD


Modified: pkg/Rcpp/ChangeLog
===================================================================
--- pkg/Rcpp/ChangeLog	2012-12-26 17:50:50 UTC (rev 4174)
+++ pkg/Rcpp/ChangeLog	2012-12-28 01:25:54 UTC (rev 4175)
@@ -1,3 +1,8 @@
+2012-12-27  Dirk Eddelbuettel  <edd at debian.org>
+
+	* src/Timer.cpp (Rcpp): Applied patch kindly supplied by Rainer
+	Hurling to support compilation on FreeBSD
+
 2012-12-26  JJ Allaire <jj at rstudio.org>
 
         * R/Attributes.R: return invisibly from void functions

Modified: pkg/Rcpp/src/Timer.cpp
===================================================================
--- pkg/Rcpp/src/Timer.cpp	2012-12-26 17:50:50 UTC (rev 4174)
+++ pkg/Rcpp/src/Timer.cpp	2012-12-28 01:25:54 UTC (rev 4175)
@@ -27,7 +27,7 @@
     #include <windows.h>
 #elif defined(__MACH__) || defined(__APPLE__)
     #include <mach/mach_time.h>
-#elif defined(linux) || defined(__linux)
+#elif defined(linux) || defined(__linux) || defined(__FreeBSD__)
     #include <time.h>
 #elif defined(sun) || defined(__sun) || defined(_AIX)
     #include <sys/time.h>
@@ -61,7 +61,7 @@
         /* Convert to nanoseconds */
         return time * (info.numer / info.denom);
     }
-#elif defined(linux) || defined(__linux)
+#elif defined(linux) || defined(__linux) || defined(__FreeBSD__)
 
     static const nanotime_t nanoseconds_in_second = 1000000000LL;