Commit f4ae934a authored by Alex Beregszaszi's avatar Alex Beregszaszi

avoid macro conflicts

Originally committed as revision 3076 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent d890d4ae
......@@ -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>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment