From 203d70a562ce3ffca51069aecda01a9f2bb61ff5 Mon Sep 17 00:00:00 2001 From: Nicholas Miell Date: Wed, 6 Sep 2006 14:43:44 -0700 Subject: [PATCH] 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 --- pixman/src/slim_internal.h | 5 +++-- src/cairoint.h | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pixman/src/slim_internal.h b/pixman/src/slim_internal.h index 742059c69..3d1e9a64f 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)) \ diff --git a/src/cairoint.h b/src/cairoint.h index bf7d28833..f17be94e1 100644 --- a/src/cairoint.h +++ b/src/cairoint.h @@ -68,8 +68,9 @@ CAIRO_BEGIN_DECLS #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)) \