aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorİsmail Dönmez <ismail@namtrac.org>2008-03-17 07:49:03 +0000
committerDiego Biurrun <diego@biurrun.de>2008-03-17 07:49:03 +0000
commit8e9ccb6c7e5467845e0a5798a2cddd14a580476b (patch)
tree2dfa05bf8c052532e61517c36eec2d2cd9edbe1a
parent5a352b14e7d14358e1e734a161e77def9580a3c3 (diff)
downloadffmpeg-8e9ccb6c7e5467845e0a5798a2cddd14a580476b.tar.gz
Fix MANGLE macro on Mac OS X.
Allows compiling a 64 bit FFmpeg on Mac OS X without using --disable-mmx. patch by İsmail Dönmez ismail namtrac org Originally committed as revision 12468 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavutil/internal.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/libavutil/internal.h b/libavutil/internal.h
index d2f08788e8..d98ea7898c 100644
--- a/libavutil/internal.h
+++ b/libavutil/internal.h
@@ -120,7 +120,8 @@
// Use rip-relative addressing if compiling PIC code on x86-64.
#if defined(__MINGW32__) || defined(__CYGWIN__) || defined(__DJGPP__) || \
- defined(__OS2__) || (defined (__OpenBSD__) && !defined(__ELF__))
+ defined(__OS2__) || defined(__APPLE__) || \
+ (defined (__OpenBSD__) && !defined(__ELF__))
# if defined(ARCH_X86_64) && defined(PIC)
# define MANGLE(a) "_" #a"(%%rip)"
# else
@@ -129,8 +130,6 @@
#else
# if defined(ARCH_X86_64) && defined(PIC)
# define MANGLE(a) #a"(%%rip)"
-# elif defined(__APPLE__)
-# define MANGLE(a) "_" #a
# else
# define MANGLE(a) #a
# endif