Merge pull request #343 from Enchufa2/master

davidgohel · web-flow · commit 673906defa0a · 2026-01-16T18:55:11.000+01:00
Prevent Rcpp from masking valid uses of Rf_error
diff --git a/src/Makevars b/src/Makevars
@@ -1 +1,2 @@
+PKG_CPPFLAGS = -DRCPP_NO_MASK_RF_ERROR
 PKG_LIBS = -lpng -lz
diff --git a/src/Makevars.ucrt b/src/Makevars.ucrt
@@ -5,4 +5,5 @@ else
   PKG_LIBS = $(shell pkg-config --libs libpng)
 endif
 
-PKG_CPPFLAGS += -DSTRICT_R_HEADERS
+PKG_CPPFLAGS += -DSTRICT_R_HEADERS \
+  -DRCPP_NO_MASK_RF_ERROR
diff --git a/src/Makevars.win b/src/Makevars.win
@@ -1,7 +1,8 @@
 RWINLIB = ../windows/harfbuzz-2.7.4
 
 PKG_CPPFLAGS = -I${RWINLIB}/include \
-	-DSTRICT_R_HEADERS
+	-DSTRICT_R_HEADERS \
+	-DRCPP_NO_MASK_RF_ERROR
 
 PKG_LIBS = -L${RWINLIB}/lib${R_ARCH}${CRT} -lpng -lz
 

Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
	`1`	`+PKG_CPPFLAGS = -DRCPP_NO_MASK_RF_ERROR`
`1`	`2`	`PKG_LIBS = -lpng -lz`