From: Alexander Strange <astrange@ithinksw.com>
Date: Sat, 22 Mar 2008 18:15:12 +0000 (+0000)
Subject: Split MANGLE macro into LOCAL_MANGLE AND EXTERN_PREFIX parts
X-Git-Tag: v0.5~5379
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=df22c35dfb45d511dafdb1e4b34fc46907f806b1;p=coroid%2Flibav_saccubus.git

Split MANGLE macro into LOCAL_MANGLE AND EXTERN_PREFIX parts
so that LOCAL_MANGLE can be used without EXTERN_PREFIX.
patch by Alexander Strange, astrange ithinksw com

Originally committed as revision 12558 to svn://svn.ffmpeg.org/ffmpeg/trunk
---

diff --git a/libavutil/internal.h b/libavutil/internal.h
index 66a136de6..8e4f81b24 100644
--- a/libavutil/internal.h
+++ b/libavutil/internal.h
@@ -120,11 +120,13 @@
 
 // Use rip-relative addressing if compiling PIC code on x86-64.
 #if defined(ARCH_X86_64) && defined(PIC)
-#    define MANGLE(a) EXTERN_PREFIX #a"(%%rip)"
+#    define LOCAL_MANGLE(a) #a "(%%rip)"
 #else
-#    define MANGLE(a) EXTERN_PREFIX #a
+#    define LOCAL_MANGLE(a) #a
 #endif
 
+#define MANGLE(a) EXTERN_PREFIX LOCAL_MANGLE(a)
+
 /* debug stuff */
 
 /* dprintf macros */