summaryrefslogtreecommitdiff
path: root/pixman
diff options
context:
space:
mode:
authorNicholas Miell <nmiell@gmail.com>2006-09-06 14:43:44 -0700
committerCarl Worth <cworth@cworth.org>2006-09-07 12:48:23 -0700
commit203d70a562ce3ffca51069aecda01a9f2bb61ff5 (patch)
tree439ba1b923032b1a0b78902fc090d35e050677fd /pixman
parent404e88ea6a08371280fb9fbc1f903e16ac868bf4 (diff)
Make the SLIM macros robust in the face of macro-renamed symbols
This doesn't actually fix the AMD64 link failure, but it does make the foo/EXT_foo/INT_foo symbol names generated by the slim_hidden_proto() and slim_hidden_def() macros consistent in the face of the meddling of pixman-remap.h. Signed-off-by: Nicholas Miell <nmiell@gmail.com>
Diffstat (limited to 'pixman')
-rw-r--r--pixman/src/slim_internal.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/pixman/src/slim_internal.h b/pixman/src/slim_internal.h
index 742059c6..3d1e9a64 100644
--- a/pixman/src/slim_internal.h
+++ b/pixman/src/slim_internal.h
@@ -78,8 +78,9 @@
level. */
#if __GNUC__ >= 3 && defined(__ELF__)
-# define slim_hidden_proto(name) slim_hidden_proto1(name, INT_##name)
-# define slim_hidden_def(name) slim_hidden_def1(name, INT_##name)
+# define slim_hidden_proto(name) slim_hidden_proto1(name, slim_hidden_int_name(name))
+# define slim_hidden_def(name) slim_hidden_def1(name, slim_hidden_int_name(name))
+# define slim_hidden_int_name(name) INT_##name
# define slim_hidden_proto1(name, internal) \
extern __typeof (name) name \
__asm__ (slim_hidden_asmname (internal)) \