diff options
| author | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-02-13 05:19:12 +0000 |
|---|---|---|
| committer | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-02-13 05:19:12 +0000 |
| commit | f5219fee6307461c7ead4358290958679d9d0d38 (patch) | |
| tree | f54cbc4f820ffb7394b1e631ffd78465a0743321 /ext/json/parser/parser.rl | |
| parent | 4607f95f7380f3eeef16230a7d55e07dc4c9f6cc (diff) | |
* ext/json: merge upstream from flori/json
change usage of TypedData. [Feature #10739][ruby-core:67564]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49582 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/json/parser/parser.rl')
| -rw-r--r-- | ext/json/parser/parser.rl | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/ext/json/parser/parser.rl b/ext/json/parser/parser.rl index e29f46d336..b9b51aaa4b 100644 --- a/ext/json/parser/parser.rl +++ b/ext/json/parser/parser.rl @@ -845,7 +845,7 @@ static size_t JSON_memsize(const void *ptr) return sizeof(*json) + FBUFFER_CAPA(json->fbuffer); } -#ifdef HAVE_TYPE_RB_DATA_TYPE_T +#ifdef NEW_TYPEDDATA_WRAPPER static const rb_data_type_t JSON_Parser_type = { "JSON/Parser", {JSON_mark, JSON_free, JSON_memsize,}, @@ -859,11 +859,7 @@ static const rb_data_type_t JSON_Parser_type = { static VALUE cJSON_parser_s_allocate(VALUE klass) { JSON_Parser *json = JSON_allocate(); -#ifdef HAVE_TYPE_RB_DATA_TYPE_T return TypedData_Wrap_Struct(klass, &JSON_Parser_type, json); -#else - return Data_Wrap_Struct(klass, JSON_mark, JSON_free, json); -#endif } /* |