diff options
| author | Martin Storsjö <martin@martin.st> | 2016-07-18 23:25:11 +0300 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2016-07-21 12:52:19 +0300 |
| commit | f637046d3134a331e4b5a7243ac3dfb92735b8a5 (patch) | |
| tree | 4d9ed42c86596e53697ffcd1496d4e90d7b9506e | |
| parent | 6f9e34baea4f6f484392e4e67f606a0835d07b73 (diff) | |
| download | ffmpeg-f637046d3134a331e4b5a7243ac3dfb92735b8a5.tar.gz | |
libavutil: Always use some GCC style attributes on clang
Clang normally disguises as GCC (defining __GNUC__), and thus get
all the normal GCC specific attributes.
Clang can also work as a drop-in replacement for MSVC, and in these
cases, it doesn't define __GNUC__, but defines _MSC_VER instead.
Even in these setups, it still supports the GCC style attributes,
thus use them, especially where there isn't any MSVC specific
version, or where the MSVC specific version doesn't work on clang
(for DECLARE_ASM_CONST).
Signed-off-by: Martin Storsjö <martin@martin.st>
| -rw-r--r-- | libavutil/attributes.h | 4 | ||||
| -rw-r--r-- | libavutil/mem.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libavutil/attributes.h b/libavutil/attributes.h index d7f2bb5c6f..c770f52a43 100644 --- a/libavutil/attributes.h +++ b/libavutil/attributes.h @@ -80,7 +80,7 @@ # define attribute_deprecated #endif -#if defined(__GNUC__) +#if defined(__GNUC__) || defined(__clang__) # define av_unused __attribute__((unused)) #else # define av_unused @@ -91,7 +91,7 @@ * away. This is useful for variables accessed only from inline * assembler without the compiler being aware. */ -#if AV_GCC_VERSION_AT_LEAST(3,1) +#if AV_GCC_VERSION_AT_LEAST(3,1) || defined(__clang__) # define av_used __attribute__((used)) #else # define av_used diff --git a/libavutil/mem.h b/libavutil/mem.h index 9f667c270b..f3cf56c498 100644 --- a/libavutil/mem.h +++ b/libavutil/mem.h @@ -48,7 +48,7 @@ #define DECLARE_ASM_CONST(n,t,v) \ AV_PRAGMA(DATA_ALIGN(v,n)) \ static const t __attribute__((aligned(n))) v -#elif defined(__GNUC__) +#elif defined(__GNUC__) || defined(__clang__) #define DECLARE_ALIGNED(n,t,v) t __attribute__ ((aligned (n))) v #define DECLARE_ASM_CONST(n,t,v) static const t av_used __attribute__ ((aligned (n))) v #elif defined(_MSC_VER) |