* ext/json/lib/json/common.rb: don't use iconv on 1.9.

  patched by Shota Fukumori [ruby-core:33164]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30004 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 9 insertions, 3 deletions

diff --git a/ext/json/lib/json/common.rb b/ext/json/lib/json/common.rb
index d5444b92c8..13debd1366 100644
--- a/ext/json/lib/json/common.rb
+++ b/ext/json/lib/json/common.rb
@@ -1,5 +1,4 @@
 require 'json/version'
-require 'iconv'
 
 module JSON
   class << self
@@ -342,8 +341,15 @@ module JSON
   end
 
   # Shortuct for iconv.
-  def self.iconv(to, from, string)
-    Iconv.iconv(to, from, string).first
+  if String.method_defined?(:encode)
+    def self.iconv(to, from, string)
+      string.encode(to, from)
+    end
+  else
+    require 'iconv'
+    def self.iconv(to, from, string)
+      Iconv.iconv(to, from, string).first
+    end
   end
 end