File tree Expand file tree Collapse file tree 2 files changed +7
-3
lines changed Expand file tree Collapse file tree 2 files changed +7
-3
lines changed Original file line number Diff line number Diff line change
1
+ 2015-08-05 Kevin Ushey <
[email protected] >
2
+
3
+ * src/api.cpp: use `_WIN32` instead of `WIN32`
4
+
1
5
2015-08-02 Dirk Eddelbuettel <
[email protected] >
2
6
3
7
* R/Attributes.R (sourceCpp): In no-rebuild-needed case, also set a
Original file line number Diff line number Diff line change @@ -34,7 +34,7 @@ using namespace Rcpp;
34
34
#endif
35
35
36
36
#if defined(__GNUC__)
37
- #if defined(WIN32 ) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__CYGWIN__) || defined(__sun) || defined(_AIX)
37
+ #if defined(_WIN32 ) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__CYGWIN__) || defined(__sun) || defined(_AIX)
38
38
// do nothing
39
39
#else
40
40
#include < execinfo.h>
@@ -257,14 +257,14 @@ SEXP rcpp_can_use_cxx11() {
257
257
// [[Rcpp::register]]
258
258
SEXP stack_trace (const char * file, int line) {
259
259
#if defined(__GNUC__)
260
- #if defined(WIN32 ) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__CYGWIN__) || defined(__sun) || defined(_AIX)
260
+ #if defined(_WIN32 ) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__CYGWIN__) || defined(__sun) || defined(_AIX)
261
261
// Simpler version for Windows and *BSD
262
262
List trace = List::create (_[" file" ] = file,
263
263
_[ " line" ] = line,
264
264
_[ " stack" ] = " C++ stack not available on this system" );
265
265
trace.attr (" class" ) = " Rcpp_stack_trace" ;
266
266
return trace;
267
- #else // ! (defined(WIN32 ) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__CYGWIN__) || defined(__sun) || defined(_AIX)
267
+ #else // ! (defined(_WIN32 ) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__CYGWIN__) || defined(__sun) || defined(_AIX)
268
268
269
269
/* inspired from http://tombarta.wordpress.com/2008/08/01/c-stack-traces-with-gcc/ */
270
270
const size_t max_depth = 100 ;
You can’t perform that action at this time.
0 commit comments