[1/2] libavutil: Define the noreturn attribute for clang in MSVC mode as well

Message ID 1490100461-15396-1-git-send-email-martin@martin.st
State Committed
Commit 3aa9c523e9cf4f4a5e239ac737281e096c884907
Headers show

Commit Message

Martin Storsjö March 21, 2017, 12:47 p.m.
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.
---
 libavutil/attributes.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Luca Barbato March 21, 2017, 1:42 p.m. | #1
On 21/03/2017 13:47, Martin Storsjö wrote:
> This is a follow-up to f637046d313.

The set should not hurt at all.

Patch

diff --git a/libavutil/attributes.h b/libavutil/attributes.h
index c770f52..cd4e299 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