diff --git a/libs/gst/check/libcheck/check.c b/libs/gst/check/libcheck/check.c index 3bf7bfe49f..28eca52fed 100644 --- a/libs/gst/check/libcheck/check.c +++ b/libs/gst/check/libcheck/check.c @@ -384,13 +384,12 @@ _ck_assert_failed (const char *file, int line, const char *expr, ...) va_end (ap); send_failure_info (to_send); - if (cur_fork_status () == CK_FORK) { #if defined(HAVE_FORK) && HAVE_FORK==1 + if (cur_fork_status () == CK_FORK) { _exit (1); -#endif /* HAVE_FORK */ - } else { - longjmp (error_jmp_buffer, 1); } +#endif /* HAVE_FORK */ + longjmp (error_jmp_buffer, 1); } SRunner * diff --git a/libs/gst/check/libcheck/check.h.in b/libs/gst/check/libcheck/check.h.in index 754de9129d..d52abc5c1a 100644 --- a/libs/gst/check/libcheck/check.h.in +++ b/libs/gst/check/libcheck/check.h.in @@ -422,20 +422,10 @@ static void __testname (int _i CK_ATTRIBUTE_UNUSED)\ /* * This is called whenever an assertion fails. - * Note that it only has the noreturn modifier when - * using fork. If fork is unavailable, the function - * calls longjmp() when a test assertion fails. Marking - * the function as noreturn causes gcc to make assumptions - * which are not valid, as longjmp() is like a return. */ -#if @HAVE_FORK@ CK_DLL_EXP void CK_EXPORT _ck_assert_failed (const char *file, int line, const char *expr, ...) CK_ATTRIBUTE_NORETURN; -#else -CK_DLL_EXP void CK_EXPORT _ck_assert_failed (const char *file, int line, - const char *expr, ...); -#endif /** * Fail the test if expression is false