From 21aff7ce08425e18cb613f13bbb0c9dbecdb2b59 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Wed, 21 Sep 2022 10:48:06 -0500 Subject: [PATCH] fix build (temp): Replace SIGSTKSZ macro w/ constexpr This macro can no longer be used as an array-length template param. It used to be known at compile-time, but that is no longer the case (https://public-inbox.org/libc-alpha/87y2ew8i1w.fsf@igel.home/T/). --- linux/include/catch/catch.hpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/linux/include/catch/catch.hpp b/linux/include/catch/catch.hpp index f7681f49e..59dedbb46 100644 --- a/linux/include/catch/catch.hpp +++ b/linux/include/catch/catch.hpp @@ -6466,6 +6466,8 @@ namespace Catch { #include +#define SPARK_SIGSTKSZ 8192 + namespace Catch { struct SignalDefs { @@ -6487,7 +6489,8 @@ namespace Catch { static bool isSet; static struct sigaction oldSigActions [sizeof(signalDefs)/sizeof(SignalDefs)]; static stack_t oldSigStack; - static char altStackMem[SIGSTKSZ]; + // SPARK FIX + static char altStackMem[SPARK_SIGSTKSZ]; static void handleSignal( int sig ) { std::string name = ""; @@ -6538,7 +6541,8 @@ namespace Catch { bool FatalConditionHandler::isSet = false; struct sigaction FatalConditionHandler::oldSigActions[sizeof(signalDefs)/sizeof(SignalDefs)] = {}; stack_t FatalConditionHandler::oldSigStack = {}; - char FatalConditionHandler::altStackMem[SIGSTKSZ] = {}; + // SPARK FIX + char FatalConditionHandler::altStackMem[SPARK_SIGSTKSZ] = {}; } // namespace Catch