Skip to content

Commit

Permalink
* eval.c (rb_f_abort): should not bypass cleanup.
Browse files Browse the repository at this point in the history
* ext/stringio/stringio.c (check_modifiable): void function.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2220 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information
nobu committed Mar 18, 2002
1 parent 2059c38 commit 7dc6637
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 2 deletions.
6 changes: 6 additions & 0 deletions ChangeLog
@@ -1,3 +1,9 @@
Mon Mar 18 17:18:06 2002 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>

* eval.c (rb_f_abort): should not bypass cleanup.

* ext/stringio/stringio.c (check_modifiable): void function.

Mon Mar 18 12:52:01 2002 WATANABE Hirofumi <eban@ruby-lang.org>

* ext/iconv/extconf.rb: workaround for GNU libiconv.
Expand Down
2 changes: 1 addition & 1 deletion eval.c
Expand Up @@ -3504,7 +3504,7 @@ rb_f_abort(argc, argv)

rb_scan_args(argc, argv, "01", &mesg);
rb_io_puts(argc, argv, rb_stderr);
exit(1);
rb_exit(1);
}
return Qnil; /* not reached */
}
Expand Down
3 changes: 2 additions & 1 deletion ext/stringio/stringio.c
Expand Up @@ -32,6 +32,7 @@ static struct StringIO* check_strio _((VALUE));
static struct StringIO* get_strio _((VALUE));
static struct StringIO* readable _((struct StringIO *));
static struct StringIO* writable _((struct StringIO *));
static struct void check_modifiable _((struct StringIO *));

#define IS_STRIO(obj) (RDATA(obj)->dmark == (RUBY_DATA_FUNC)strio_mark)
#define error_inval(msg) (errno = EINVAL, rb_sys_fail(msg))
Expand Down Expand Up @@ -117,7 +118,7 @@ writable(ptr)
return ptr;
}

static struct StringIO*
static struct void
check_modifiable(ptr)
struct StringIO *ptr;
{
Expand Down

0 comments on commit 7dc6637

Please sign in to comment.