Skip to content

Commit 5b7810e

Browse files
committed
move ancient checkArity decl from Rdecl.h to Rcallbacks.c
1 parent 1325462 commit 5b7810e

2 files changed

Lines changed: 2 additions & 4 deletions

File tree

src/jri/src/Rcallbacks.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@
2626
#ifndef checkArity
2727
#define checkArity Rf_checkArity
2828
#endif
29-
#else
29+
void Rf_checkArity(SEXP, SEXP); /* include/Defn.h */
30+
#else /* in 2.6.0 re-mapped to Rf_checkArityCall so we just disable it to avoid API issues */
3031
#define checkArity(X,Y)
3132
#endif
3233

src/jri/src/Rdecl.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,4 @@ int R_ReadConsole(char*, unsigned char*, int, int); /* include/Defn.h */
1919
int Rf_initialize_R(int ac, char **av); /* include/Rembedded.h - exists since 2.4.0 */
2020
#endif /* R < 4.6.0 */
2121

22-
/* this one is still left over */
23-
void Rf_checkArity(SEXP, SEXP); /* include/Defn.h */
24-
2522
#endif /* __RDECL_H__ */

0 commit comments

Comments
 (0)