From f37a49e8c8f76eacfc8a5ce66040cc017dbe34ff Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 25 Jul 2008 10:50:52 +0000 Subject: [PATCH] * 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 --- ChangeLog | 4 ++++ regint.h | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/ChangeLog b/ChangeLog index 2658d1f7ec..3965fb1e70 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Fri Jul 25 19:50:49 2008 Nobuyoshi Nakada + + * regint.c (xmalloc, xrealloc, xfree): not to use ruby managed memory. + Fri Jul 25 15:52:40 2008 Koichi Sasada * vm.c (vm_invoke_proc): skip setting safe_level if diff --git a/regint.h b/regint.h index 63d9a12a2d..e6c499ac7e 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