archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-23 04:55:21 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merges r24408 and r24409 from trunk into ruby_1_9_1.

Browse source 
--
* ruby.c (rb_stdio_set_default_encoding): declared.
--
* io.c (rb_stdio_set_default_encoding): prototyped.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@24471 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2009-08-08 15:34:48 +00:00
parent 392762807f
commit 9f79faa5d5
4 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Wed Aug 5 19:11:01 2009 NARUSE, Yui <naruse@ruby-lang.org>
* ruby.c (rb_stdio_set_default_encoding): declared.
Wed Aug 5 18:46:01 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> Wed Aug 5 18:46:01 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* debug.c (ruby_dummy_gdb_enums): made public. [ruby-dev:39001] * debug.c (ruby_dummy_gdb_enums): made public. [ruby-dev:39001]

2
io.c
View file

@ -7949,7 +7949,7 @@ rb_io_set_encoding(int argc, VALUE *argv, VALUE io)
} }
void void
rb_stdio_set_default_encoding() rb_stdio_set_default_encoding(void)
{ {
extern VALUE rb_stdin, rb_stdout, rb_stderr; extern VALUE rb_stdin, rb_stdout, rb_stderr;
VALUE val = Qnil; VALUE val = Qnil;

2
ruby.c
View file

@ -1188,6 +1188,8 @@ rb_f_chomp(argc, argv)
return str; return str;
} }
void rb_stdio_set_default_encoding(void);
static VALUE static VALUE
process_options(VALUE arg) process_options(VALUE arg)
{ {

2
version.h
View file

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.1" #define RUBY_VERSION "1.9.1"
#define RUBY_PATCHLEVEL 275 #define RUBY_PATCHLEVEL 276
#define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 1 #define RUBY_VERSION_TEENY 1