From 8c02f3f0ef703b05a74f4622101305fe17b9bd77 Mon Sep 17 00:00:00 2001 From: yugui Date: Fri, 16 Jan 2009 04:07:16 +0000 Subject: merges r21588 from trunk into ruby_1_9_1. * parse.y (rb_parse_in_main): fixed typo. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@21595 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ parse.y | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index b3748731f..294c2bfe2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Fri Jan 16 11:47:56 2009 Nobuyoshi Nakada + + * parse.y (rb_parse_in_main): fixed typo. + Fri Jan 16 02:25:46 2009 Yusuke Endoh * thread.c (rb_thread_execute_interrupts): if signal is already diff --git a/parse.y b/parse.y index b014a46c1..0d34ecbca 100644 --- a/parse.y +++ b/parse.y @@ -437,7 +437,7 @@ static void fixup_nodes(NODE **); extern int rb_dvar_defined(ID); extern int rb_local_defined(ID); extern int rb_parse_in_eval(void); -extern int rb_prase_in_main(void); +extern int rb_parse_in_main(void); static VALUE reg_compile_gen(struct parser_params*, VALUE, int); #define reg_compile(str,options) reg_compile_gen(parser, str, options) -- cgit