Skip to content

Commit 3979394

Browse files
committed
Further refine #if test for 'long long' by conditioning __LP64__ on also using clang/llvm
1 parent 3bbfbcd commit 3979394

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

ChangeLog

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
2013-09-14 Dirk Eddelbuettel <edd@debian.org>
22

3+
* inst/include/Rcpp/platform/compiler.h: Further refine #if test for
4+
'long long' by conditioning __LP64__ on also using clang/llvm
5+
36
* src/attributes.cpp (Rcpp): Precede closing '>' by space to avoid '>>'
47

58
2013-09-13 Romain Francois <romain@r-enthusiasts.com>

inst/include/Rcpp/platform/compiler.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@
178178
#endif
179179

180180
#ifdef __GNUC__
181-
#if defined(__GXX_EXPERIMENTAL_CXX0X__) || defined(__LP64__)
181+
#if defined(__GXX_EXPERIMENTAL_CXX0X__) || (defined (__clang__) && defined(__LP64__))
182182
#ifdef __LONG_LONG_MAX__
183183
__extension__ typedef long long int rcpp_long_long_type;
184184
__extension__ typedef unsigned long long int rcpp_ulong_long_type;

0 commit comments

Comments
 (0)