From 7995cc16416a0aa974e18225f4e89be6dbafedf6 Mon Sep 17 00:00:00 2001 From: Tony Cook Date: Wed, 10 Jan 2024 15:10:15 +1100 Subject: [PATCH] DynaLoader: dl_dyld.xs: don't undef bool I expect this was added when we added our own bool, and before we used bool so liberally ourselves. Now dl_dyld.xs fails to compile, since MY_CXT_CLONE indirectly uses UNLIKELY() which casts to bool. Tested locally with: ./Configure -des -Dusedevel -Dusethreads -Ddlsrc=dl_dyld.xs on a modern Darwin, which failed before this change and builds after. Based on work done by Sevan Janiyan in #21751. Fixes #21751 --- ext/DynaLoader/DynaLoader_pm.PL | 2 +- ext/DynaLoader/dl_dyld.xs | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/ext/DynaLoader/DynaLoader_pm.PL b/ext/DynaLoader/DynaLoader_pm.PL index f428472c7c4f..fe2cf5e0652a 100644 --- a/ext/DynaLoader/DynaLoader_pm.PL +++ b/ext/DynaLoader/DynaLoader_pm.PL @@ -90,7 +90,7 @@ package DynaLoader; # Tim.Bunce@ig.co.uk, August 1994 BEGIN { - our $VERSION = '1.54'; + our $VERSION = '1.55'; } # Note: in almost any other piece of code "our" would have been a better diff --git a/ext/DynaLoader/dl_dyld.xs b/ext/DynaLoader/dl_dyld.xs index 716c6ea421d1..aeb8e026b695 100644 --- a/ext/DynaLoader/dl_dyld.xs +++ b/ext/DynaLoader/dl_dyld.xs @@ -48,7 +48,6 @@ been tested on NeXT platforms. #include "dlutils.c" /* for SaveError() etc */ #undef environ -#undef bool #import static char *dlerror()