Fix #119 Remove HAS_UNWIND_PROTECT macro and friends

r-lib · Dec 4, 2024 · 5ba8672 · 5ba8672
1 parent 02b5670
commit 5ba8672
Showing 1 changed file with 1 addition and 9 deletions.
diff --git a/src/utils.h b/src/utils.h
@@ -8,14 +8,6 @@
 
 #include <cpp11/protect.hpp>
 
-#ifdef HAS_UNWIND_PROTECT
-#define CPP_UNWIND R_ContinueUnwind(err);
-#else
-#define CPP_UNWIND \
-do {               \
-} while (false);
-#endif
-
 #define BEGIN_CPP                 \
 SEXP err = R_NilValue;            \
 const size_t ERROR_SIZE = 8192;   \
@@ -35,7 +27,7 @@ catch (...) {                                                  \
 if (buf[0] != '\0') {                                          \
   Rf_error("%s", buf);                                         \
 } else if (err != R_NilValue) {                                \
-  CPP_UNWIND                                                 \
+  R_ContinueUnwind(err);                                                 \
 }
 
 inline bool strcmp_no_case(const char * A, const char * B) {