diff options
author | Jean Boussier <[email protected]> | 2024-10-17 14:17:31 +0200 |
---|---|---|
committer | git <[email protected]> | 2024-10-17 12:22:16 +0000 |
commit | 6105bae331aa8a804ffa762735e8647507f85179 (patch) | |
tree | ef6d208635399c1729fb4504f7368f4430040a2b /ext/json | |
parent | 0e2ac4658430ae5c8beba36e0b608902b3404879 (diff) |
[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
Diffstat (limited to 'ext/json')
-rw-r--r-- | ext/json/generator/generator.h | 25 | ||||
-rw-r--r-- | ext/json/parser/parser.h | 19 |
2 files changed, 0 insertions, 44 deletions
diff --git a/ext/json/generator/generator.h b/ext/json/generator/generator.h index 25905498a3..09bf68079c 100644 --- a/ext/json/generator/generator.h +++ b/ext/json/generator/generator.h @@ -23,22 +23,6 @@ typedef unsigned char _Bool; #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 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_set(VALUE self, VALUE strict); 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; diff --git a/ext/json/parser/parser.h b/ext/json/parser/parser.h index f6974461ae..e11bddf7c2 100644 --- a/ext/json/parser/parser.h +++ b/ext/json/parser/parser.h @@ -3,16 +3,6 @@ #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 # define MAYBE_UNUSED(x) x #endif @@ -64,15 +54,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); -#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; |