mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
merges r24127 and r24133 from trunk into ruby_1_9_1.
-- * dir.c (push_glob): fix GC problem. -- * dir.c (push_glob): re-fix GC problem. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@24169 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
792799e815
commit
4ebeddc38f
3 changed files with 10 additions and 2 deletions
|
|
@ -1,3 +1,11 @@
|
|||
Thu Jul 16 08:56:32 2009 Koichi Sasada <ko1@atdot.net>
|
||||
|
||||
* dir.c (push_glob): re-fix GC problem.
|
||||
|
||||
Wed Jul 15 23:45:11 2009 Koichi Sasada <ko1@atdot.net>
|
||||
|
||||
* dir.c (push_glob): fix GC problem.
|
||||
|
||||
Tue May 5 10:42:28 2009 NARUSE, Yui <naruse@ruby-lang.org>
|
||||
|
||||
* ext/json: Update to JSON 1.1.4.
|
||||
|
|
|
|||
2
dir.c
2
dir.c
|
|
@ -1550,7 +1550,7 @@ push_glob(VALUE ary, VALUE str, int flags)
|
|||
args.value = ary;
|
||||
args.enc = enc;
|
||||
|
||||
return ruby_brace_glob0(RSTRING_PTR(str), flags | GLOB_VERBOSE,
|
||||
return ruby_brace_glob0(StringValuePtr(str), flags | GLOB_VERBOSE,
|
||||
rb_glob_caller, (VALUE)&args, enc);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#define RUBY_VERSION "1.9.1"
|
||||
#define RUBY_RELEASE_DATE "2009-07-15"
|
||||
#define RUBY_PATCHLEVEL 240
|
||||
#define RUBY_PATCHLEVEL 241
|
||||
#define RUBY_VERSION_MAJOR 1
|
||||
#define RUBY_VERSION_MINOR 9
|
||||
#define RUBY_VERSION_TEENY 1
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue