diff options
| author | Clément Bœsch <cboesch@gopro.com> | 2017-02-02 11:26:05 +0100 |
|---|---|---|
| committer | Clément Bœsch <cboesch@gopro.com> | 2017-02-02 11:26:05 +0100 |
| commit | 55b2cfa921c3ad5a821fc0ec85093a658b102caa (patch) | |
| tree | ca64d0de007b747d21920d91ca0fe61f2206e480 | |
| parent | a0860b0a388d5471ae3e60fbf004509a3783f392 (diff) | |
| parent | f637046d3134a331e4b5a7243ac3dfb92735b8a5 (diff) | |
| download | ffmpeg-55b2cfa921c3ad5a821fc0ec85093a658b102caa.tar.gz | |
Merge commit 'f637046d3134a331e4b5a7243ac3dfb92735b8a5'
* commit 'f637046d3134a331e4b5a7243ac3dfb92735b8a5':
libavutil: Always use some GCC style attributes on clang
Merged-by: Clément Bœsch <cboesch@gopro.com>
| -rw-r--r-- | libavutil/attributes.h | 5 | ||||
| -rw-r--r-- | libavutil/mem.h | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/libavutil/attributes.h b/libavutil/attributes.h index 5c6b9deecb..54d1901116 100644 --- a/libavutil/attributes.h +++ b/libavutil/attributes.h @@ -121,8 +121,7 @@ #endif #endif - -#if defined(__GNUC__) +#if defined(__GNUC__) || defined(__clang__) # define av_unused __attribute__((unused)) #else # define av_unused @@ -133,7 +132,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 f9d8884788..718a143c4c 100644 --- a/libavutil/mem.h +++ b/libavutil/mem.h @@ -97,7 +97,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) |