diff options
Diffstat (limited to 'ext/json/parser')
| -rw-r--r-- | ext/json/parser/parser.c | 6 | ||||
| -rw-r--r-- | ext/json/parser/parser.h | 17 | ||||
| -rw-r--r-- | ext/json/parser/parser.rl | 6 |
3 files changed, 9 insertions, 20 deletions
diff --git a/ext/json/parser/parser.c b/ext/json/parser/parser.c index f4617aae44..eed58e5d39 100644 --- a/ext/json/parser/parser.c +++ b/ext/json/parser/parser.c @@ -2122,7 +2122,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,}, @@ -2136,11 +2136,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 } /* diff --git a/ext/json/parser/parser.h b/ext/json/parser/parser.h index 394b79a4ea..e98f26a297 100644 --- a/ext/json/parser/parser.h +++ b/ext/json/parser/parser.h @@ -49,15 +49,9 @@ typedef struct JSON_ParserStruct { #define GET_PARSER \ GET_PARSER_INIT; \ if (!json->Vsource) rb_raise(rb_eTypeError, "uninitialized instance") -#ifdef HAVE_TYPE_RB_DATA_TYPE_T #define GET_PARSER_INIT \ JSON_Parser *json; \ TypedData_Get_Struct(self, JSON_Parser, &JSON_Parser_type, json) -#else -#define GET_PARSER_INIT \ - JSON_Parser *json; \ - Data_Get_Struct(self, JSON_Parser, json) -#endif #define MinusInfinity "-Infinity" #define EVIL 0x666 @@ -79,10 +73,6 @@ static void JSON_mark(void *json); static void JSON_free(void *json); static VALUE cJSON_parser_s_allocate(VALUE klass); static VALUE cParser_source(VALUE self); -#ifdef HAVE_TYPE_RB_DATA_TYPE_T -static const rb_data_type_t JSON_Parser_type; -#endif - #ifndef ZALLOC #define ZALLOC(type) ((type *)ruby_zalloc(sizeof(type))) static inline void *ruby_zalloc(size_t n) @@ -92,5 +82,12 @@ static inline void *ruby_zalloc(size_t n) return p; } #endif +#ifdef TypedData_Wrap_Struct +static const rb_data_type_t JSON_Parser_type; +#define NEW_TYPEDDATA_WRAPPER 1 +#else +#define TypedData_Wrap_Struct(klass, ignore, json) Data_Wrap_Struct(klass, JSON_mark, JSON_free, json) +#define TypedData_Get_Struct(self, JSON_Parser, ignore, json) Data_Get_Struct(self, JSON_Parser, json) +#endif #endif 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 } /* |