From a2e497d5ede45bd4f4a57f494027020d7bd1733b Mon Sep 17 00:00:00 2001
From: naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 10 Jul 2011 08:01:04 +0000
Subject: * ext/json: Merge json gem 1.5.4+ (f7f78896607b6f6226cd).   [Bug
 #4700]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32493 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ext/json/parser/extconf.rb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'ext/json/parser/extconf.rb')

diff --git a/ext/json/parser/extconf.rb b/ext/json/parser/extconf.rb
index 64d1716a7a..4a10dd2ed6 100644
--- a/ext/json/parser/extconf.rb
+++ b/ext/json/parser/extconf.rb
@@ -1,5 +1,10 @@
 require 'mkmf'
 require 'rbconfig'
 
-have_header("re.h")
+if RUBY_VERSION < "1.9"
+  have_header("re.h")
+else
+  have_header("ruby/re.h")
+  have_header("ruby/encoding.h")
+end
 create_makefile 'json/ext/parser'
-- 
cgit v1.2.3