[Rcpp-commits] r3584 - in pkg/Rcpp: . inst src

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

Author: edd
Date: 2012-04-22 18:33:51 +0200 (Sun, 22 Apr 2012)
New Revision: 3584

Modified:
   pkg/Rcpp/ChangeLog
   pkg/Rcpp/inst/NEWS
   pkg/Rcpp/src/debugging.cpp
Log:
added Cygwin support thanks to patch by Dario Buttari


Modified: pkg/Rcpp/ChangeLog
===================================================================
--- pkg/Rcpp/ChangeLog	2012-04-20 16:40:49 UTC (rev 3583)
+++ pkg/Rcpp/ChangeLog	2012-04-22 16:33:51 UTC (rev 3584)
@@ -1,3 +1,8 @@
+2012-04-22  Dirk Eddelbuettel  <edd at debian.org>
+
+	* src/debugging.cpp: Expanded 'if defined()' test to included Cygwin
+	thanks to a patch submitted by Dario Buttari
+
 2012-04-19  Dirk Eddelbuettel  <edd at debian.org>
 
 	* src/Evaluator.cpp: errorOccuredSym never used and commented out

Modified: pkg/Rcpp/inst/NEWS
===================================================================
--- pkg/Rcpp/inst/NEWS	2012-04-20 16:40:49 UTC (rev 3583)
+++ pkg/Rcpp/inst/NEWS	2012-04-22 16:33:51 UTC (rev 3584)
@@ -5,6 +5,8 @@
 
     o   Extended functionality to let R modify C++ clases imported via modules
 
+    o   Support compilation in Cygwin thanks to a patch by Dario Buttari
+
 0.9.10  2012-02-16
 
     o   Rearrange headers so that Rcpp::Rcout can be used by RcppArmadillo et al

Modified: pkg/Rcpp/src/debugging.cpp
===================================================================
--- pkg/Rcpp/src/debugging.cpp	2012-04-20 16:40:49 UTC (rev 3583)
+++ pkg/Rcpp/src/debugging.cpp	2012-04-22 16:33:51 UTC (rev 3584)
@@ -1,8 +1,8 @@
-// -*- mode: C++; c-indent-level: 4; c-basic-offset: 4; tab-width: 8 -*-
+// -*- mode: C++; c-indent-level: 4; c-basic-offset: 4; indent-tabs-mode: nil; -*-
 //
 // debugging.cpp: R/C++ interface class library -- debugging helpers
 //
-// Copyright (C) 2010 - 2011 Dirk Eddelbuettel and Romain Francois
+// Copyright (C) 2010 - 2012  Dirk Eddelbuettel and Romain Francois
 //
 // This file is part of Rcpp.
 //
@@ -22,7 +22,8 @@
 #include <Rcpp.h>
 
 #if defined(__GNUC__)
-#if defined(WIN32) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+#if defined(WIN32) || defined(__FreeBSD__) || defined(__NetBSD__) || \
+    defined(__OpenBSD__) || defined(__CYGWIN__)
 // Simpler version for Windows and *BSD 
 SEXP stack_trace( const char* file, int line ){
     Rcpp::List trace = Rcpp::List::create(