From 3aa9c523e9cf4f4a5e239ac737281e096c884907 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Tue, 21 Mar 2017 14:26:27 +0200 Subject: [PATCH] libavutil: Define the noreturn attribute for clang in MSVC mode as well MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is a follow-up to f637046d313. Without the noreturn attribute set, avconv_opt.c fails to build after d2e6dd32a44 with the error "control may reach end of non-void function". By making sure the noreturn attribute is set properly, this compiles as intended. Signed-off-by: Martin Storsjö --- libavutil/attributes.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavutil/attributes.h b/libavutil/attributes.h index c770f52a43..cd4e299531 100644 --- a/libavutil/attributes.h +++ b/libavutil/attributes.h @@ -117,7 +117,7 @@ # define av_printf_format(fmtpos, attrpos) #endif -#if AV_GCC_VERSION_AT_LEAST(2,5) +#if AV_GCC_VERSION_AT_LEAST(2,5) || defined(__clang__) # define av_noreturn __attribute__((noreturn)) #else # define av_noreturn