[ruby/json] Get rid of compatibility code for older rubies
All of these are for rubies older than 2.3. https://github.com/ruby/json/commit/811297f86a
This commit is contained in:
parent
0e2ac46584
commit
6105bae331
@ -23,22 +23,6 @@ typedef unsigned char _Bool;
|
|||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef HAVE_RUBY_RE_H
|
|
||||||
#include "ruby/re.h"
|
|
||||||
#else
|
|
||||||
#include "re.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef rb_intern_str
|
|
||||||
#define rb_intern_str(string) SYM2ID(rb_str_intern(string))
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef rb_obj_instance_variables
|
|
||||||
#define rb_obj_instance_variables(object) rb_funcall(object, rb_intern("instance_variables"), 0)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define option_given_p(opts, key) RTEST(rb_funcall(opts, i_key_p, 1, key))
|
|
||||||
|
|
||||||
static void convert_UTF8_to_JSON(FBuffer *out_buffer, VALUE in_string, bool out_ascii_only, bool out_script_safe);
|
static void convert_UTF8_to_JSON(FBuffer *out_buffer, VALUE in_string, bool out_ascii_only, bool out_script_safe);
|
||||||
static char *fstrndup(const char *ptr, unsigned long len);
|
static char *fstrndup(const char *ptr, unsigned long len);
|
||||||
|
|
||||||
@ -140,15 +124,6 @@ static VALUE cState_script_safe_set(VALUE self, VALUE depth);
|
|||||||
static VALUE cState_strict(VALUE self);
|
static VALUE cState_strict(VALUE self);
|
||||||
static VALUE cState_strict_set(VALUE self, VALUE strict);
|
static VALUE cState_strict_set(VALUE self, VALUE strict);
|
||||||
static FBuffer *cState_prepare_buffer(VALUE self);
|
static FBuffer *cState_prepare_buffer(VALUE self);
|
||||||
#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
|
|
||||||
|
|
||||||
static const rb_data_type_t JSON_Generator_State_type;
|
static const rb_data_type_t JSON_Generator_State_type;
|
||||||
|
|
||||||
|
@ -3,16 +3,6 @@
|
|||||||
|
|
||||||
#include "ruby.h"
|
#include "ruby.h"
|
||||||
|
|
||||||
#ifndef HAVE_RUBY_RE_H
|
|
||||||
#include "re.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef HAVE_RUBY_ST_H
|
|
||||||
#include "ruby/st.h"
|
|
||||||
#else
|
|
||||||
#include "st.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef MAYBE_UNUSED
|
#ifndef MAYBE_UNUSED
|
||||||
# define MAYBE_UNUSED(x) x
|
# define MAYBE_UNUSED(x) x
|
||||||
#endif
|
#endif
|
||||||
@ -64,15 +54,6 @@ static void JSON_mark(void *json);
|
|||||||
static void JSON_free(void *json);
|
static void JSON_free(void *json);
|
||||||
static VALUE cJSON_parser_s_allocate(VALUE klass);
|
static VALUE cJSON_parser_s_allocate(VALUE klass);
|
||||||
static VALUE cParser_source(VALUE self);
|
static VALUE cParser_source(VALUE self);
|
||||||
#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
|
|
||||||
|
|
||||||
static const rb_data_type_t JSON_Parser_type;
|
static const rb_data_type_t JSON_Parser_type;
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user