diff options
| author | glebius <glebius@FreeBSD.org> | 2016-01-11 01:09:50 +0000 |
|---|---|---|
| committer | glebius <glebius@FreeBSD.org> | 2016-01-11 01:09:50 +0000 |
| commit | c41fbaf9bc76f0b7650e448fbd88d0a9815f47fd (patch) | |
| tree | 3b45c8e63a37b132f0fe10c570b8302052c547de /contrib/ntp/sntp/unity/unity_internals.h | |
| parent | 3066f138bc3bf99f5cf6ec9412903d206c329cc7 (diff) | |
| download | FreeBSD-src-c41fbaf9bc76f0b7650e448fbd88d0a9815f47fd.zip FreeBSD-src-c41fbaf9bc76f0b7650e448fbd88d0a9815f47fd.tar.gz | |
Merge r293423, r293469:
ntp 4.2.8p5
Relnotes: yes
Diffstat (limited to 'contrib/ntp/sntp/unity/unity_internals.h')
| -rw-r--r-- | contrib/ntp/sntp/unity/unity_internals.h | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/contrib/ntp/sntp/unity/unity_internals.h b/contrib/ntp/sntp/unity/unity_internals.h index c2aabc3..bf1bf3d 100644 --- a/contrib/ntp/sntp/unity/unity_internals.h +++ b/contrib/ntp/sntp/unity/unity_internals.h @@ -305,6 +305,18 @@ extern int UNITY_OUTPUT_CHAR(int); # undef UNITY_WEAK_PRAGMA #endif +#if !defined(UNITY_NORETURN_ATTRIBUTE) +# ifdef __GNUC__ // includes clang +# if !(defined(__WIN32__) && defined(__clang__)) +# define UNITY_NORETURN_ATTRIBUTE __attribute__((noreturn)) +# endif +# endif +#endif + +#ifndef UNITY_NORETURN_ATTRIBUTE +# define UNITY_NORETURN_ATTRIBUTE +#endif + //------------------------------------------------------- // Internal Structs Needed @@ -465,7 +477,7 @@ void UnityAssertNumbersWithin(const _U_SINT delta, const UNITY_LINE_TYPE lineNumber, const UNITY_DISPLAY_STYLE_T style); -void UnityFail(const char* message, const UNITY_LINE_TYPE line); +void UnityFail(const char* message, const UNITY_LINE_TYPE line) UNITY_NORETURN_ATTRIBUTE; void UnityIgnore(const char* message, const UNITY_LINE_TYPE line); |
