Browse Source

avoid macro conflicts

Originally committed as revision 3076 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.5
Alex Beregszaszi 21 years ago
parent
commit
f4ae934a3b
1 changed files with 4 additions and 0 deletions
  1. +4
    -0
      libavcodec/common.h

+ 4
- 0
libavcodec/common.h View File

@@ -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…
Cancel
Save