Commit 51908fd5 authored by alex's avatar alex

avoid macro conflicts


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@3076 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 4a494c51
......@@ -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