Skip to content

Commit

Permalink
Do not attempt to add dllimport attribute in a re-declaration (error …
Browse files Browse the repository at this point in the history
…with

clang).


git-svn-id: https://svn.r-project.org/R/trunk@84904 00db46b3-68df-0310-9c12-caf00c1e9a41
  • Loading branch information
kalibera committed Aug 8, 2023
1 parent 92870cb commit c199e77
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/include/Rinlinedfuns.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit c199e77

Please sign in to comment.