summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-07-25 10:50:52 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-07-25 10:50:52 +0000
commitf37a49e8c8f76eacfc8a5ce66040cc017dbe34ff (patch)
treebcb85c6522476e05a46c3d79c105723cbfcc3fff
parent7c8ad088f5ca528fd47138bb8f6fed19201dca59 (diff)
* regint.c (xmalloc, xrealloc, xfree): not to use ruby managed memory.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18213 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--regint.h4
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 2658d1f..3965fb1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Jul 25 19:50:49 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * regint.c (xmalloc, xrealloc, xfree): not to use ruby managed memory.
+
Fri Jul 25 15:52:40 2008 Koichi Sasada <ko1@atdot.net>
* vm.c (vm_invoke_proc): skip setting safe_level if
diff --git a/regint.h b/regint.h
index 63d9a12..e6c499a 100644
--- a/regint.h
+++ b/regint.h
@@ -85,6 +85,10 @@
/* escape other system UChar definition */
#ifndef RUBY_DEFINES_H
#include "ruby/ruby.h"
+#undef xmalloc
+#undef xrealloc
+#undef xcalloc
+#undef xfree
#endif
#ifdef ONIG_ESCAPE_UCHAR_COLLISION
#undef ONIG_ESCAPE_UCHAR_COLLISION