Module: Mesa Branch: master Commit: c58c9f712d89c1004a0e455c1ed02ff6e8f4fb3c URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c58c9f712d89c1004a0e455c1ed02ff6e8f4fb3c
Author: Brian Paul <[email protected]> Date: Fri Mar 30 11:07:46 2018 -0600 nir/spirv: move NORETURN annotation on _vtn_fail() prototype This needs to before the function, not after, to compile with MSVC. This works with gcc too. Reviewed-by: Neil Roberts <[email protected]> --- src/compiler/spirv/vtn_private.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/compiler/spirv/vtn_private.h b/src/compiler/spirv/vtn_private.h index 269de92225..982b426e70 100644 --- a/src/compiler/spirv/vtn_private.h +++ b/src/compiler/spirv/vtn_private.h @@ -71,8 +71,10 @@ void _vtn_warn(struct vtn_builder *b, const char *file, unsigned line, * So long as these two things continue to hold, we can easily longjmp back to * spirv_to_nir(), clean up the builder, and return NULL. */ -void _vtn_fail(struct vtn_builder *b, const char *file, unsigned line, - const char *fmt, ...) NORETURN PRINTFLIKE(4, 5); +NORETURN void +_vtn_fail(struct vtn_builder *b, const char *file, unsigned line, + const char *fmt, ...) PRINTFLIKE(4, 5); + #define vtn_fail(...) _vtn_fail(b, __FILE__, __LINE__, __VA_ARGS__) /** Fail if the given expression evaluates to true */ _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
