RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-02-20 23:07:02 +00:00
Code Issues Releases Wiki Activity

Rename always_inline macro to av_always_inline so as not to clash with

Browse Source 
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
This commit is contained in:
diego 2008-08-26 21:29:54 +00:00
parent 6c675482ff
commit 03337f15ad
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
liba52/bitstream.h
View File

@ -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]));

8
liba52/liba52_changes.diff
View File

@ -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]));