From 4d8d3184d18b1a9d2eadb86a6688dc62eca7eabc Mon Sep 17 00:00:00 2001
From: naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 11 Mar 2012 13:36:06 +0000
Subject: * ext/json: Merge 164a75c8bd2007d32c4d7665d53140d8fc126dcd.  
 [ruby-core:41917] [Bug #5846]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34971 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ext/json/parser/parser.h | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'ext/json/parser/parser.h')

diff --git a/ext/json/parser/parser.h b/ext/json/parser/parser.h
index fc73810dd6..b192064c09 100644
--- a/ext/json/parser/parser.h
+++ b/ext/json/parser/parser.h
@@ -3,16 +3,10 @@
 
 #include "ruby.h"
 
-#if HAVE_RE_H
+#ifndef HAVE_RUBY_RE_H
 #include "re.h"
 #endif
 
-#ifdef HAVE_RUBY_ENCODING_H
-#include "ruby/encoding.h"
-#define FORCE_UTF8(obj) ((obj) = rb_enc_associate(rb_str_dup(obj), rb_utf8_encoding()))
-#else
-#define FORCE_UTF8(obj)
-#endif
 #ifdef HAVE_RUBY_ST_H
 #include "ruby/st.h"
 #else
@@ -49,6 +43,7 @@ typedef struct JSON_ParserStruct {
     VALUE array_class;
     int create_additions;
     VALUE match_string;
+    FBuffer *fbuffer;
 } JSON_Parser;
 
 #define GET_PARSER                          \
-- 
cgit v1.2.3