diff options
| author | Alex Beregszaszi <alex@rtfs.hu> | 2004-04-26 09:43:55 +0000 |
|---|---|---|
| committer | Alex Beregszaszi <alex@rtfs.hu> | 2004-04-26 09:43:55 +0000 |
| commit | f4ae934a3b08762a33a325db4d40fccb06a5d11f (patch) | |
| tree | 43934c0cfe53fdc2c1d42fff324c17edaf3a7f6f /libavcodec/common.h | |
| parent | d890d4aed1c38c99a07c4f10e45b6369499f00fc (diff) | |
| download | ffmpeg-f4ae934a3b08762a33a325db4d40fccb06a5d11f.tar.gz | |
avoid macro conflicts
Originally committed as revision 3076 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/common.h')
| -rw-r--r-- | libavcodec/common.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/common.h b/libavcodec/common.h index 203579ac5e..b0a3db526d 100644 --- a/libavcodec/common.h +++ b/libavcodec/common.h @@ -76,17 +76,21 @@ extern const struct AVOption avoptions_workaround_bug[11]; # define restrict #endif +#ifndef always_inline #if defined(__GNUC__) && (__GNUC__ > 3 || __GNUC__ == 3 && __GNUC_MINOR__ > 0) # define always_inline __attribute__((always_inline)) inline #else # define always_inline inline #endif +#endif +#ifndef attribute_used #if defined(__GNUC__) && (__GNUC__ > 3 || __GNUC__ == 3 && __GNUC_MINOR__ > 0) # define attribute_used __attribute__((used)) #else # define attribute_used #endif +#endif #ifndef EMULATE_INTTYPES # include <inttypes.h> |