From e4963224156345c75601311518b32505ac1eb060 Mon Sep 17 00:00:00 2001 From: yugui Date: Fri, 19 Dec 2008 12:12:03 +0000 Subject: merges r20870 from trunk into ruby_1_9_1. * io.c (rb_io_extract_encoding_option): "internal_encoding: nil" to specify no-transcoding. and other corner case fixed. [ruby-dev:37496] * hash.c (rb_hash_lookup2): new function to look-up hash with default value. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@20886 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- include/ruby/intern.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include/ruby') diff --git a/include/ruby/intern.h b/include/ruby/intern.h index 25ca518f8..dc2e1325a 100644 --- a/include/ruby/intern.h +++ b/include/ruby/intern.h @@ -359,6 +359,7 @@ VALUE rb_hash_dup(VALUE); VALUE rb_hash_freeze(VALUE); VALUE rb_hash_aref(VALUE, VALUE); VALUE rb_hash_lookup(VALUE, VALUE); +VALUE rb_hash_lookup2(VALUE, VALUE, VALUE); VALUE rb_hash_fetch(VALUE, VALUE); VALUE rb_hash_aset(VALUE, VALUE, VALUE); VALUE rb_hash_delete_if(VALUE); -- cgit