summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkouji <kouji@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-08-13 14:09:48 +0000
committerkouji <kouji@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-08-13 14:09:48 +0000
commitcdc2278f890c7e9715b2b8cb7d7cdbdfd4200b8b (patch)
tree2b5ee54183b30372fe156a79a1a49dcefe48a642
parent96af71a288ef97800b658b4d0cda7ce83f3f95be (diff)
* 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
-rw-r--r--ChangeLog5
-rw-r--r--string.c4
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 <kouji@takao7.net>
+
+ * string.c (alias_func): changed to 'weak, alias' from 'alias' for
+ Mac OSX. (closes #429)
+
Wed Aug 13 19:40:12 2008 Koichi Sasada <ko1@atdot.net>
* 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;}