mirror of
https://github.com/xenia-project/FFmpeg.git
synced 2024-11-24 20:19:55 +00:00
avoid macro conflicts
Originally committed as revision 3076 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
d890d4aed1
commit
f4ae934a3b
@ -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>
|
||||
|
Loading…
Reference in New Issue
Block a user