From cdc2278f890c7e9715b2b8cb7d7cdbdfd4200b8b Mon Sep 17 00:00:00 2001 From: kouji Date: Wed, 13 Aug 2008 14:09:48 +0000 Subject: [PATCH] * string.c (alias_func): changed to 'weak, alias' from 'alias' for Mac OSX. (closes #429) git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18585 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ string.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index e90a0efbbf..3b4a545aa1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Aug 13 23:05:51 2008 TAKAO Kouji + + * string.c (alias_func): changed to 'weak, alias' from 'alias' for + Mac OSX. (closes #429) + Wed Aug 13 19:40:12 2008 Koichi Sasada * gc.c: count only freed object as freelist size. diff --git a/string.c b/string.c index 7df1d00a88..27b813e4f0 100644 --- a/string.c +++ b/string.c @@ -43,9 +43,9 @@ VALUE rb_cString; VALUE rb_cSymbol; -#if defined(__GNUC__) && !(defined(__APPLE__) && (defined(__MACH__) || defined(__DARWIN__))) +#ifdef __GNUC__ #define alias_func(old_prot, new_name, args) \ -VALUE old_prot __attribute__((alias(#new_name))); +VALUE old_prot __attribute__((weak, alias(#new_name))); #else #define alias_func(old_prot, new_name, args) \ VALUE old_prot {return new_name args;}