summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-09 02:18:20 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-09 02:18:20 +0000
commita5e362b3cdedb8785dd18be3178dcd41abe0c7d8 (patch)
tree944668f1c28e44db1ab94f90e5ea146aa9e34ae5
parent42565244845416a142b8e4fc12d6e52d22b8ab69 (diff)
merges r21339 from trunk into ruby_1_9_1.
* ext/curses/curses.c (free_window): use xfree instead of free. [ruby-dev:37200] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@21399 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--ext/curses/curses.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 879be3706..24834dd79 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jan 5 16:15:00 2009 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
+
+ * ext/curses/curses.c (free_window): use xfree instead of free.
+ [ruby-dev:37200]
+
Mon Jan 5 08:41:13 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
* file.c (rb_file_s_stat): need type check for non string values.
diff --git a/ext/curses/curses.c b/ext/curses/curses.c
index 497842517..c5d0bb752 100644
--- a/ext/curses/curses.c
+++ b/ext/curses/curses.c
@@ -94,7 +94,7 @@ free_window(struct windata *winp)
{
if (winp->window && winp->window != stdscr) delwin(winp->window);
winp->window = 0;
- free(winp);
+ xfree(winp);
}
static VALUE