summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorknu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-08-13 06:53:24 +0000
committerknu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-08-13 06:53:24 +0000
commit1bda0538c1ff65d50355051725d3d363e2b1c77e (patch)
tree86405e8db2f92148f19d0c8bd95a01dd2c702976
parent2950e86274e84543b54c9bac5175956d51f344ed (diff)
downloadruby-1bda0538c1ff65d50355051725d3d363e2b1c77e.tar.gz
ruby-1bda0538c1ff65d50355051725d3d363e2b1c77e.tar.xz
ruby-1bda0538c1ff65d50355051725d3d363e2b1c77e.zip
* string.c: Apply a temporary fix to fix build on OS X. A real
fix will follow later. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@18565 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--string.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 3c9788d3d..7bc57d93f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Aug 13 15:51:22 2008 Akinori MUSHA <knu@iDaemons.org>
+
+ * string.c: Apply a temporary fix to fix build on OS X. A real
+ fix will follow later.
+
Wed Aug 13 15:25:09 2008 Akinori MUSHA <knu@iDaemons.org>
* enumerator.c (Init_Enumerator): Rename Enumerable::Enumerator to
diff --git a/string.c b/string.c
index 41e950d17..e72becfbd 100644
--- a/string.c
+++ b/string.c
@@ -43,7 +43,7 @@
VALUE rb_cString;
VALUE rb_cSymbol;
-#ifdef __GNUC__
+#if defined(__GNUC__) && !(defined(__APPLE__) && (defined(__MACH__) || defined(__DARWIN__)))
#define alias_func(old_prot, new_name, args) \
VALUE old_prot __attribute__((alias(#new_name)));
#else