diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-08-26 21:29:54 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-08-26 21:29:54 +0000 |
| commit | 03337f15adc6dcd55c3d3a89270636fd17f836fd (patch) | |
| tree | e370a3b5e3e7d053ee2832df622dbb6694922f5b /liba52 | |
| parent | 6c675482ffdc6f7e0aa27151b466d84504cfb40b (diff) | |
| download | mpv-03337f15adc6dcd55c3d3a89270636fd17f836fd.tar.bz2 mpv-03337f15adc6dcd55c3d3a89270636fd17f836fd.tar.xz | |
Rename always_inline macro to av_always_inline so as not to clash with
with __attribute__((always_inline)) declarations.
This fixes the build on Mac OS X 10.4.11.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27485 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'liba52')
| -rw-r--r-- | liba52/bitstream.h | 8 | ||||
| -rw-r--r-- | liba52/liba52_changes.diff | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/liba52/bitstream.h b/liba52/bitstream.h index af74989785..f5e6fdee94 100644 --- a/liba52/bitstream.h +++ b/liba52/bitstream.h @@ -27,9 +27,9 @@ /* code from ffmpeg/libavcodec */ #if defined(__GNUC__) && (__GNUC__ > 3 || __GNUC_ == 3 && __GNUC_MINOR__ > 0) -# define always_inline __attribute__((always_inline)) inline +# define av_always_inline __attribute__((always_inline)) inline #else -# define always_inline inline +# define av_always_inline inline #endif #if defined(__sparc__) || defined(hpux) @@ -47,7 +47,7 @@ # define unaligned32(a) (*(uint32_t*)(a)) #else # ifdef __GNUC__ -static always_inline uint32_t unaligned32(const void *v) { +static av_always_inline uint32_t unaligned32(const void *v) { struct Unaligned { uint32_t i; } __attribute__((packed)); @@ -86,7 +86,7 @@ static inline uint32_t unaligned32(const void *v) { # else # define swab32(x) __generic_swab32(x) - static always_inline const uint32_t __generic_swab32(uint32_t x) + static av_always_inline const uint32_t __generic_swab32(uint32_t x) { return ((((uint8_t*)&x)[0] << 24) | (((uint8_t*)&x)[1] << 16) | (((uint8_t*)&x)[2] << 8) | (((uint8_t*)&x)[3])); diff --git a/liba52/liba52_changes.diff b/liba52/liba52_changes.diff index cde07a1a8f..8efd94d1c3 100644 --- a/liba52/liba52_changes.diff +++ b/liba52/liba52_changes.diff @@ -81,9 +81,9 @@ +/* code from ffmpeg/libavcodec */ +#if defined(__GNUC__) && (__GNUC__ > 3 || __GNUC_ == 3 && __GNUC_MINOR__ > 0) -+# define always_inline __attribute__((always_inline)) inline ++# define av_always_inline __attribute__((always_inline)) inline +#else -+# define always_inline inline ++# define av_always_inline inline +#endif + +#if defined(__sparc__) || defined(hpux) @@ -101,7 +101,7 @@ +# define unaligned32(a) (*(uint32_t*)(a)) +#else +# ifdef __GNUC__ -+static always_inline uint32_t unaligned32(const void *v) { ++static av_always_inline uint32_t unaligned32(const void *v) { + struct Unaligned { + uint32_t i; + } __attribute__((packed)); @@ -142,7 +142,7 @@ - (((uint8_t*)&x)[2] << 8) | (((uint8_t*)&x)[3])) - +# define swab32(x) __generic_swab32(x) -+ static always_inline const uint32_t __generic_swab32(uint32_t x) ++ static av_always_inline const uint32_t __generic_swab32(uint32_t x) + { + return ((((uint8_t*)&x)[0] << 24) | (((uint8_t*)&x)[1] << 16) | + (((uint8_t*)&x)[2] << 8) | (((uint8_t*)&x)[3])); |