summaryrefslogtreecommitdiff
path: root/ext/json
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-12-27 11:12:58 (GMT)
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-12-27 11:12:58 (GMT)
commitd29ff247936236673cf117cff558f55c787750a8 (patch)
treea411d51ef37a52160c5deff7220a99ba0147fd6c /ext/json
parent81e9d9799a0911058157404c1976f00598fc7b6a (diff)
json: backward compatibilities
* ext/json/generator/generator.c (JSON_Generator_State_type): add #ifdef for backward compatibility. * ext/json/parser/parser.rl (JSON_Parser_type): ditto. * ext/json/generator/generator.h (ZALLOC): add fallback definition. * ext/json/parser/parser.h (ZALLOC): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49038 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/json')
-rw-r--r--ext/json/generator/generator.c2
-rw-r--r--ext/json/generator/generator.h10
-rw-r--r--ext/json/parser/parser.c5
-rw-r--r--ext/json/parser/parser.h10
-rw-r--r--ext/json/parser/parser.rl5
5 files changed, 28 insertions, 4 deletions
diff --git a/ext/json/generator/generator.c b/ext/json/generator/generator.c
index f56ac09..673da33 100644
--- a/ext/json/generator/generator.c
+++ b/ext/json/generator/generator.c
@@ -518,8 +518,10 @@ static size_t State_memsize(const void *ptr)
static const rb_data_type_t JSON_Generator_State_type = {
"JSON/Generator/State",
{NULL, State_free, State_memsize,},
+#ifdef RUBY_TYPED_FREE_IMMEDIATELY
0, 0,
RUBY_TYPED_FREE_IMMEDIATELY,
+#endif
};
static JSON_Generator_State *State_allocate(void)
diff --git a/ext/json/generator/generator.h b/ext/json/generator/generator.h
index ddd1aa8..9277682 100644
--- a/ext/json/generator/generator.h
+++ b/ext/json/generator/generator.h
@@ -149,4 +149,14 @@ static VALUE cState_depth_set(VALUE self, VALUE depth);
static FBuffer *cState_prepare_buffer(VALUE self);
static const rb_data_type_t JSON_Generator_State_type;
+#ifndef ZALLOC
+#define ZALLOC(type) ((type *)ruby_zalloc(sizeof(type)))
+static inline void *ruby_zalloc(size_t n)
+{
+ void *p = ruby_xmalloc(n);
+ memset(p, 0, n);
+ return p;
+}
+#endif
+
#endif
diff --git a/ext/json/parser/parser.c b/ext/json/parser/parser.c
index f9d0d19..b9f753c 100644
--- a/ext/json/parser/parser.c
+++ b/ext/json/parser/parser.c
@@ -2094,8 +2094,7 @@ static VALUE cParser_parse(VALUE self)
static JSON_Parser *JSON_allocate(void)
{
- JSON_Parser *json = ALLOC(JSON_Parser);
- MEMZERO(json, JSON_Parser, 1);
+ JSON_Parser *json = ZALLOC(JSON_Parser);
json->fbuffer = fbuffer_alloc(0);
return json;
}
@@ -2126,8 +2125,10 @@ static size_t JSON_memsize(const void *ptr)
static const rb_data_type_t JSON_Parser_type = {
"JSON/Parser",
{JSON_mark, JSON_free, JSON_memsize,},
+#ifdef RUBY_TYPED_FREE_IMMEDIATELY
0, 0,
RUBY_TYPED_FREE_IMMEDIATELY,
+#endif
};
static VALUE cJSON_parser_s_allocate(VALUE klass)
diff --git a/ext/json/parser/parser.h b/ext/json/parser/parser.h
index 45afbc2..980999a 100644
--- a/ext/json/parser/parser.h
+++ b/ext/json/parser/parser.h
@@ -75,4 +75,14 @@ static VALUE cJSON_parser_s_allocate(VALUE klass);
static VALUE cParser_source(VALUE self);
static const rb_data_type_t JSON_Parser_type;
+#ifndef ZALLOC
+#define ZALLOC(type) ((type *)ruby_zalloc(sizeof(type)))
+static inline void *ruby_zalloc(size_t n)
+{
+ void *p = ruby_xmalloc(n);
+ memset(p, 0, n);
+ return p;
+}
+#endif
+
#endif
diff --git a/ext/json/parser/parser.rl b/ext/json/parser/parser.rl
index 3d7b5a6..0b6fb04 100644
--- a/ext/json/parser/parser.rl
+++ b/ext/json/parser/parser.rl
@@ -817,8 +817,7 @@ static VALUE cParser_parse(VALUE self)
static JSON_Parser *JSON_allocate(void)
{
- JSON_Parser *json = ALLOC(JSON_Parser);
- MEMZERO(json, JSON_Parser, 1);
+ JSON_Parser *json = ZALLOC(JSON_Parser);
json->fbuffer = fbuffer_alloc(0);
return json;
}
@@ -849,8 +848,10 @@ static size_t JSON_memsize(const void *ptr)
static const rb_data_type_t JSON_Parser_type = {
"JSON/Parser",
{JSON_mark, JSON_free, JSON_memsize,},
+#ifdef RUBY_TYPED_FREE_IMMEDIATELY
0, 0,
RUBY_TYPED_FREE_IMMEDIATELY,
+#endif
};
static VALUE cJSON_parser_s_allocate(VALUE klass)