fix version checks

RcppCore · Jul 9, 2024 · df61715 · df61715
1 parent edcf98f
commit df61715
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/inst/include/Rcpp/r/compat.h b/inst/include/Rcpp/r/compat.h
@@ -22,13 +22,15 @@
 #ifndef RCPP_R_COMPAT_H
 #define RCPP_R_COMPAT_H
 
-#if defined(STRING_PTR_RO)
+#include <Rversion.h>
+
+#if R_VERSION >= R_Version(4, 4, 0)
 # define RCPP_STRING_PTR STRING_PTR_RO
 #else
 # define RCPP_STRING_PTR STRING_PTR
 #endif
 
-#if defined(VECTOR_PTR_RO)
+#if R_VERSION >= R_Version(4, 4, 0)
 # define RCPP_VECTOR_PTR VECTOR_PTR_RO
 #else
 # define RCPP_VECTOR_PTR VECTOR_PTR

diff --git a/src/api.cpp b/src/api.cpp
@@ -112,7 +112,7 @@ namespace Rcpp {
         case BCODESXP:  	return "BCODESXP";
         case EXTPTRSXP: 	return "EXTPTRSXP";
         case WEAKREFSXP:    return "WEAKREFSXP";
-#if R_Version >= R_Version(4,4,0)					// replaces S4SXP in R 4.4.0
+#if R_VERSION >= R_Version(4,4,0)					// replaces S4SXP in R 4.4.0
         case OBJSXP:    	return Rf_isS4(x) ? "S4SXP" : "OBJSXP"; 	// cf src/main/inspect.c
 #else
         case S4SXP:     	return "S4SXP";