diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-07-13 08:07:50 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-07-13 08:07:50 +0000 |
commit | 2d6fb10a9cb105de9976f081949e9df96274d230 (patch) | |
tree | 7fc75e6b979a1f161fbbbd9046079eeae5c61b1b | |
parent | f70e60783e2b83c5749f9461d156d3bd9a5c221a (diff) |
merges r24013 from trunk into ruby_1_9_1.
--
* include/ruby/ruby.h (rb_obj_{untrust,untrusted,trust}): added
prototypes. [ruby-dev:38756]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@24078 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | include/ruby/intern.h | 3 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 9 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Fri Jul 10 11:41:39 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * include/ruby/ruby.h (rb_obj_{untrust,untrusted,trust}): added + prototypes. [ruby-dev:38756] + Fri Jul 10 10:25:19 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * vm_insnhelper.c (vm_search_superclass): checks for implici diff --git a/include/ruby/intern.h b/include/ruby/intern.h index a7c77a8c61..5d8eee36ca 100644 --- a/include/ruby/intern.h +++ b/include/ruby/intern.h @@ -443,6 +443,9 @@ VALUE rb_obj_init_copy(VALUE,VALUE); VALUE rb_obj_taint(VALUE); VALUE rb_obj_tainted(VALUE); VALUE rb_obj_untaint(VALUE); +VALUE rb_obj_untrust(VALUE); +VALUE rb_obj_untrusted(VALUE); +VALUE rb_obj_trust(VALUE); VALUE rb_obj_freeze(VALUE); VALUE rb_obj_frozen_p(VALUE); VALUE rb_obj_id(VALUE); @@ -4,7 +4,7 @@ #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 -#define RUBY_PATCHLEVEL 227 +#define RUBY_PATCHLEVEL 228 #define RUBY_RELEASE_YEAR 2009 #define RUBY_RELEASE_MONTH 7 #define RUBY_RELEASE_DAY 12 |