diff options
| author | onqtam <vik.kirilov@gmail.com> | 2017-04-11 22:07:57 +0300 |
|---|---|---|
| committer | onqtam <vik.kirilov@gmail.com> | 2017-05-16 00:22:18 +0300 |
| commit | 53d4e7887b9ea10f63caebcb375ca2f9a372b04a (patch) | |
| tree | ee0de4185a17a84d2c62c21c1bd4faa2b34e5275 | |
| parent | 596e1bad4a148f6620d9ae642c7016841933e697 (diff) | |
added "struct" infront of "sigaction" - seems necessary - see this SO question: http://stackoverflow.com/questions/14213270/sigaction-both-struct-and-function
| -rw-r--r-- | doctest/doctest.h | 19 | ||||
| -rw-r--r-- | doctest/parts/doctest_impl.h | 19 |
2 files changed, 20 insertions, 18 deletions
diff --git a/doctest/doctest.h b/doctest/doctest.h index 0e5d9ad..8c18160 100644 --- a/doctest/doctest.h +++ b/doctest/doctest.h @@ -4012,10 +4012,10 @@ namespace detail struct FatalConditionHandler { - static bool isSet; - static sigaction oldSigActions[sizeof(signalDefs) / sizeof(SignalDefs)]; - static stack_t oldSigStack; - static char altStackMem[SIGSTKSZ]; + static bool isSet; + static struct sigaction oldSigActions[sizeof(signalDefs) / sizeof(SignalDefs)]; + static stack_t oldSigStack; + static char altStackMem[SIGSTKSZ]; static void handleSignal(int sig) { std::string name = "<unknown signal>"; @@ -4038,7 +4038,7 @@ namespace detail sigStack.ss_size = SIGSTKSZ; sigStack.ss_flags = 0; sigaltstack(&sigStack, &oldSigStack); - sigaction sa = {0}; + struct sigaction sa = {0}; sa.sa_handler = handleSignal; sa.sa_flags = SA_ONSTACK; @@ -4061,10 +4061,11 @@ namespace detail } }; - bool FatalConditionHandler::isSet = false; - sigaction FatalConditionHandler::oldSigActions[sizeof(signalDefs) / sizeof(SignalDefs)] = {}; - stack_t FatalConditionHandler::oldSigStack = {}; - char FatalConditionHandler::altStackMem[SIGSTKSZ] = {}; + bool FatalConditionHandler::isSet = false; + struct sigaction FatalConditionHandler::oldSigActions[sizeof(signalDefs) / sizeof(SignalDefs)] = + {}; + stack_t FatalConditionHandler::oldSigStack = {}; + char FatalConditionHandler::altStackMem[SIGSTKSZ] = {}; #endif // DOCTEST_PLATFORM_WINDOWS #endif // DOCTEST_CONFIG_POSIX_SIGNALS || DOCTEST_CONFIG_WINDOWS_SEH diff --git a/doctest/parts/doctest_impl.h b/doctest/parts/doctest_impl.h index 032b9c0..7942275 100644 --- a/doctest/parts/doctest_impl.h +++ b/doctest/parts/doctest_impl.h @@ -1121,10 +1121,10 @@ namespace detail struct FatalConditionHandler { - static bool isSet; - static sigaction oldSigActions[sizeof(signalDefs) / sizeof(SignalDefs)]; - static stack_t oldSigStack; - static char altStackMem[SIGSTKSZ]; + static bool isSet; + static struct sigaction oldSigActions[sizeof(signalDefs) / sizeof(SignalDefs)]; + static stack_t oldSigStack; + static char altStackMem[SIGSTKSZ]; static void handleSignal(int sig) { std::string name = "<unknown signal>"; @@ -1147,7 +1147,7 @@ namespace detail sigStack.ss_size = SIGSTKSZ; sigStack.ss_flags = 0; sigaltstack(&sigStack, &oldSigStack); - sigaction sa = {0}; + struct sigaction sa = {0}; sa.sa_handler = handleSignal; sa.sa_flags = SA_ONSTACK; @@ -1170,10 +1170,11 @@ namespace detail } }; - bool FatalConditionHandler::isSet = false; - sigaction FatalConditionHandler::oldSigActions[sizeof(signalDefs) / sizeof(SignalDefs)] = {}; - stack_t FatalConditionHandler::oldSigStack = {}; - char FatalConditionHandler::altStackMem[SIGSTKSZ] = {}; + bool FatalConditionHandler::isSet = false; + struct sigaction FatalConditionHandler::oldSigActions[sizeof(signalDefs) / sizeof(SignalDefs)] = + {}; + stack_t FatalConditionHandler::oldSigStack = {}; + char FatalConditionHandler::altStackMem[SIGSTKSZ] = {}; #endif // DOCTEST_PLATFORM_WINDOWS #endif // DOCTEST_CONFIG_POSIX_SIGNALS || DOCTEST_CONFIG_WINDOWS_SEH |