Skip to content

Commit 686e04a

Browse files
committed
use '_WIN32' instead of 'WIN32' (closes #336)
1 parent d680346 commit 686e04a

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

ChangeLog

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
2015-08-05 Kevin Ushey <[email protected]>
2+
3+
* src/api.cpp: use `_WIN32` instead of `WIN32`
4+
15
2015-08-02 Dirk Eddelbuettel <[email protected]>
26

37
* R/Attributes.R (sourceCpp): In no-rebuild-needed case, also set a

src/api.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ using namespace Rcpp;
3434
#endif
3535

3636
#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)
3838
// do nothing
3939
#else
4040
#include <execinfo.h>
@@ -257,14 +257,14 @@ SEXP rcpp_can_use_cxx11() {
257257
// [[Rcpp::register]]
258258
SEXP stack_trace(const char* file, int line) {
259259
#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)
261261
// Simpler version for Windows and *BSD
262262
List trace = List::create(_["file"] = file,
263263
_[ "line" ] = line,
264264
_[ "stack" ] = "C++ stack not available on this system");
265265
trace.attr("class") = "Rcpp_stack_trace";
266266
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)
268268

269269
/* inspired from http://tombarta.wordpress.com/2008/08/01/c-stack-traces-with-gcc/ */
270270
const size_t max_depth = 100;

0 commit comments

Comments
 (0)