diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-03-11 13:36:06 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-03-11 13:36:06 +0000 |
| commit | 4d8d3184d18b1a9d2eadb86a6688dc62eca7eabc (patch) | |
| tree | 03e3a00e4e484ffdb46d5d774ab887dc695b8ed0 /ext/json/parser/parser.h | |
| parent | 9d9ab5a384de3877f29cef8c0293c1caa432692c (diff) | |
| download | ruby-4d8d3184d18b1a9d2eadb86a6688dc62eca7eabc.tar.gz | |
* 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
Diffstat (limited to 'ext/json/parser/parser.h')
| -rw-r--r-- | ext/json/parser/parser.h | 9 |
1 files changed, 2 insertions, 7 deletions
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 \ |