From c199e77f90716ec2b690887fe9c3c90d728cce6d Mon Sep 17 00:00:00 2001 From: kalibera Date: Tue, 8 Aug 2023 13:23:02 +0000 Subject: [PATCH] Do not attempt to add dllimport attribute in a re-declaration (error with clang). git-svn-id: https://svn.r-project.org/R/trunk@84904 00db46b3-68df-0310-9c12-caf00c1e9a41 --- src/include/Rinlinedfuns.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/include/Rinlinedfuns.h b/src/include/Rinlinedfuns.h index 03ab50c1db7..2ec08b1b844 100644 --- a/src/include/Rinlinedfuns.h +++ b/src/include/Rinlinedfuns.h @@ -471,9 +471,9 @@ SEXP STRING_ELT(SEXP x, R_xlen_t i); #endif #ifdef INLINE_PROTECT -extern int R_PPStackSize; -extern int R_PPStackTop; -extern SEXP* R_PPStack; +LibExtern int R_PPStackSize; +LibExtern int R_PPStackTop; +LibExtern SEXP* R_PPStack; INLINE_FUN SEXP protect(SEXP s) { @@ -991,7 +991,7 @@ INLINE_FUN Rboolean isNumber(SEXP s) /* As from R 2.4.0 we check that the value is allowed. */ INLINE_FUN SEXP ScalarLogical(int x) { - extern SEXP R_LogicalNAValue, R_TrueValue, R_FalseValue; + LibExtern SEXP R_LogicalNAValue, R_TrueValue, R_FalseValue; if (x == NA_LOGICAL) return R_LogicalNAValue; else if (x != 0) return R_TrueValue; else return R_FalseValue;