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

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

Author: edd
Date: 2013-01-03 03:33:56 +0100 (Thu, 03 Jan 2013)
New Revision: 4183

Modified:
   pkg/Rcpp/ChangeLog
   pkg/Rcpp/src/Timer.cpp
Log:
Applied refinement of previously applied patch re *BSD builds, see http://bugs.debian.org/697032 for more


Modified: pkg/Rcpp/ChangeLog
===================================================================
--- pkg/Rcpp/ChangeLog	2012-12-31 03:59:39 UTC (rev 4182)
+++ pkg/Rcpp/ChangeLog	2013-01-03 02:33:56 UTC (rev 4183)
@@ -1,3 +1,8 @@
+2013-01-02  Dirk Eddelbuettel  <edd at debian.org>
+
+	* src/Timer.cpp (Rcpp): Applied refinement of previously applied
+	patch re *BSD builds, see http://bugs.debian.org/697032 for more
+
 2012-12-30  Dirk Eddelbuettel  <edd at debian.org>
 
 	* src/Timer.cpp (Rcpp): Added defined() tests for more *BSD family

Modified: pkg/Rcpp/src/Timer.cpp
===================================================================
--- pkg/Rcpp/src/Timer.cpp	2012-12-31 03:59:39 UTC (rev 4182)
+++ pkg/Rcpp/src/Timer.cpp	2013-01-03 02:33:56 UTC (rev 4183)
@@ -25,9 +25,9 @@
 #if defined(_WIN32) 
     #define WIN32_LEAN_AND_MEAN
     #include <windows.h>
-#elif defined(__MACH__) || defined(__APPLE__)
+#elif defined(__APPLE__)
     #include <mach/mach_time.h>
-#elif defined(linux) || defined(__linux) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD_kernel__)
+#elif defined(linux) || defined(__linux) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__GLIBC__) || defined(__GNU__)
     #include <time.h>
 #elif defined(sun) || defined(__sun) || defined(_AIX)
     #include <sys/time.h>
@@ -49,7 +49,7 @@
         return 1.0e9 * time_var.QuadPart / frequency.QuadPart;
     }
 
-#elif defined(__MACH__) || defined(__APPLE__)
+#elif defined(__APPLE__)
      
     nanotime_t get_nanotime(void) {
         nanotime_t time;
@@ -62,7 +62,7 @@
         return time * (info.numer / info.denom);
     }
 
-#elif defined(linux) || defined(__linux) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD_kernel__)
+#elif defined(linux) || defined(__linux) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__GLIBC__) || defined(__GNU__)
 
     static const nanotime_t nanoseconds_in_second = 1000000000LL;