From e0aec58dc3662227016a085a1fa05bec7066664a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= Date: Mon, 22 Dec 2025 17:03:53 +0100 Subject: [PATCH] Prevent Rcpp from masking valid uses of Rf_error --- src/Makevars | 1 + src/Makevars.ucrt | 3 ++- src/Makevars.win | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/Makevars b/src/Makevars index 2ac7d523..cd590ce9 100644 --- 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 index af9a03b9..0a6e431c 100644 --- 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 index 2d4efc90..882c9f28 100644 --- 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