From 0837acd0f2363efbf8deece5a40dadd4b8771d73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor=20Cs=C3=A1rdi?= Date: Sat, 26 Oct 2024 13:36:10 +0200 Subject: [PATCH] Fix compilation on DragonFlyBSD (#1338) --- ChangeLog | 4 ++++ inst/include/Rcpp/exceptions_impl.h | 19 ++++++++++--------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2c02ab0f0..65eebe4af 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2024-10-26 Gábor Csárdi + + * inst/include/Rcpp/exceptions_impl.h: check for DragonFlyBSD to fix compilation + 2024-10-07 Iñaki Ucar * inst/include/Rcpp/platform/compiler.h: Uncomment HAS_VARIADIC_TEMPLATES diff --git a/inst/include/Rcpp/exceptions_impl.h b/inst/include/Rcpp/exceptions_impl.h index 8f4502809..4cfecdfbb 100644 --- a/inst/include/Rcpp/exceptions_impl.h +++ b/inst/include/Rcpp/exceptions_impl.h @@ -23,15 +23,16 @@ // disable demangler on platforms where we have no support #ifndef RCPP_DEMANGLER_ENABLED -# if defined(_WIN32) || \ - defined(__FreeBSD__) || \ - defined(__NetBSD__) || \ - defined(__OpenBSD__) || \ - defined(__CYGWIN__) || \ - defined(__sun) || \ - defined(_AIX) || \ - defined(__MUSL__) || \ - defined(__HAIKU__) || \ +# if defined(_WIN32) || \ + defined(__FreeBSD__) || \ + defined(__NetBSD__) || \ + defined(__OpenBSD__) || \ + defined(__DragonFly__) || \ + defined(__CYGWIN__) || \ + defined(__sun) || \ + defined(_AIX) || \ + defined(__MUSL__) || \ + defined(__HAIKU__) || \ defined(__ANDROID__) # define RCPP_DEMANGLER_ENABLED 0 # elif defined(__GNUC__) || defined(__clang__)