aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSam Hocevar <sam+ffmpeg@zoy.org>2006-03-06 22:06:33 +0000
committerDiego Biurrun <diego@biurrun.de>2006-03-06 22:06:33 +0000
commit5f112e1f967d66ed33cea954e4573478f6598725 (patch)
treeafd4787cc8e17b28efa8e9735fc7502c0e3c909b
parent79c343c0243c869407b2e1673127f5580e31f582 (diff)
downloadffmpeg-5f112e1f967d66ed33cea954e4573478f6598725.tar.gz
Proper mangling information for symbols in OS X Mach-O shared objects.
patch by Samuel Hocevar, sam ..at.. zoy ..dot.. org Originally committed as revision 5120 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/libpostproc/mangle.h2
-rw-r--r--libavutil/common.h2
2 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/libpostproc/mangle.h b/libavcodec/libpostproc/mangle.h
index aa09cd6bf7..46480ab437 100644
--- a/libavcodec/libpostproc/mangle.h
+++ b/libavcodec/libpostproc/mangle.h
@@ -19,6 +19,8 @@
#else
#if defined(ARCH_X86_64) && defined(PIC)
#define MANGLE(a) #a"(%%rip)"
+#elif defined(CONFIG_DARWIN)
+#define MANGLE(a) "_" #a
#else
#define MANGLE(a) #a
#endif
diff --git a/libavutil/common.h b/libavutil/common.h
index f4dcf310b0..b2590c93a9 100644
--- a/libavutil/common.h
+++ b/libavutil/common.h
@@ -267,6 +267,8 @@ static inline float floorf(float f) {
# else
# if defined(ARCH_X86_64) && defined(PIC)
# define MANGLE(a) #a"(%%rip)"
+# elif defined(CONFIG_DARWIN)
+# define MANGLE(a) "_" #a
# else
# define MANGLE(a) #a
# endif