aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--missing/alloca.c2
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 3fc5da0657..1658266e67 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Apr 5 13:26:15 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * missing/alloca.c (xmalloc, xfree): use ruby version, not
+ depending on RUBY_LIB_PREFIX. [ruby-dev:45492][Bug #6255]
+
Wed Apr 4 13:06:39 2012 NARUSE, Yui <naruse@ruby-lang.org>
* lib/ftp/ftp.rb (Net::FTP#close): restore original read_timeout.
diff --git a/missing/alloca.c b/missing/alloca.c
index 960cda0c32..96121f7647 100644
--- a/missing/alloca.c
+++ b/missing/alloca.c
@@ -58,10 +58,8 @@ typedef char *pointer; /* generic pointer type */
#define NULL 0 /* null pointer constant */
#endif
-#ifdef RUBY_LIB_PREFIX
#define xmalloc ruby_xmalloc
#define xfree ruby_xfree
-#endif
extern void xfree();
extern pointer xmalloc();