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/generator/generator.h | |
| 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/generator/generator.h')
| -rw-r--r-- | ext/json/generator/generator.h | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/ext/json/generator/generator.h b/ext/json/generator/generator.h index b2d2f0a17c..416159a9c5 100644 --- a/ext/json/generator/generator.h +++ b/ext/json/generator/generator.h @@ -78,13 +78,8 @@ typedef struct JSON_Generator_StateStruct { long buffer_initial_length; } JSON_Generator_State; -#ifdef HAVE_TYPE_RB_DATA_TYPE_T #define GET_STATE_TO(self, state) \ TypedData_Get_Struct(self, JSON_Generator_State, &JSON_Generator_State_type, state) -#else -#define GET_STATE_TO(self, state) \ - Data_Get_Struct(self, JSON_Generator_State, state) -#endif #define GET_STATE(self) \ JSON_Generator_State *state; \ @@ -97,7 +92,7 @@ typedef struct JSON_Generator_StateStruct { \ rb_scan_args(argc, argv, "01", &Vstate); \ Vstate = cState_from_state_s(cState, Vstate); \ - GET_STATE_TO(Vstate, state); \ + TypedData_Get_Struct(Vstate, JSON_Generator_State, &JSON_Generator_State_type, state); \ buffer = cState_prepare_buffer(Vstate); \ generate_json_##type(buffer, Vstate, state, self); \ return fbuffer_to_s(buffer) @@ -152,10 +147,6 @@ static VALUE cState_ascii_only_p(VALUE self); static VALUE cState_depth(VALUE self); static VALUE cState_depth_set(VALUE self, VALUE depth); static FBuffer *cState_prepare_buffer(VALUE self); -#ifdef HAVE_TYPE_RB_DATA_TYPE_T -static const rb_data_type_t JSON_Generator_State_type; -#endif - #ifndef ZALLOC #define ZALLOC(type) ((type *)ruby_zalloc(sizeof(type))) static inline void *ruby_zalloc(size_t n) @@ -165,5 +156,12 @@ static inline void *ruby_zalloc(size_t n) return p; } #endif +#ifdef TypedData_Wrap_Struct +static const rb_data_type_t JSON_Generator_State_type; +#define NEW_TYPEDDATA_WRAPPER 1 +#else +#define TypedData_Wrap_Struct(klass, ignore, json) Data_Wrap_Struct(klass, NULL, State_free, json) +#define TypedData_Get_Struct(self, JSON_Generator_State, ignore, json) Data_Get_Struct(self, JSON_Generator_State, json) +#endif #endif |