From 3c11b2f2c9fcba96ae3d97958c3db64201c8eaf3 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 3 Dec 2010 23:50:13 +0000
Subject: [PATCH] * ext/iconv/iconv.c (Init_iconv): no warnings if $VERBOSE is
 nil.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30075 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog         | 4 ++++
 ext/iconv/iconv.c | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index c4725b4650..e47b64e20b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Dec  4 08:50:10 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/iconv/iconv.c (Init_iconv): no warnings if $VERBOSE is nil.
+
 Sat Dec  4 08:25:15 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* vm_insnhelper.c (vm_call_method): revert r30064 and r30071,
diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c
index 83a4b5e299..531745c38d 100644
--- a/ext/iconv/iconv.c
+++ b/ext/iconv/iconv.c
@@ -1208,7 +1208,9 @@ Init_iconv(void)
 {
     VALUE rb_cIconv = rb_define_class("Iconv", rb_cData);
 
-    warn_deprecated();
+    if (!NIL_P(ruby_verbose)) {
+	warn_deprecated();
+    }
     rb_define_alloc_func(rb_cIconv, iconv_s_allocate);
     rb_define_singleton_method(rb_cIconv, "open", iconv_s_open, -1);
     rb_define_singleton_method(rb_cIconv, "iconv", iconv_s_iconv, -1);