From e66b242ba5a84b5155db45006f81b3ac99a5f8c0 Mon Sep 17 00:00:00 2001 From: yugui Date: Mon, 13 Jul 2009 08:07:50 +0000 Subject: 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: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@24078 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ include/ruby/intern.h | 3 +++ version.h | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 9968a4808..528bf38d6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Jul 10 11:41:39 2009 Nobuyoshi Nakada + + * include/ruby/ruby.h (rb_obj_{untrust,untrusted,trust}): added + prototypes. [ruby-dev:38756] + Fri Jul 10 10:25:19 2009 Nobuyoshi Nakada * vm_insnhelper.c (vm_search_superclass): checks for implici diff --git a/include/ruby/intern.h b/include/ruby/intern.h index a7c77a8c6..5d8eee36c 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); diff --git a/version.h b/version.h index 33ebd97c8..5463ce554 100644 --- a/version.h +++ b/version.h @@ -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 -- cgit