diff options
| author | Florian Frank <flori@ping.de> | 2012-08-17 16:41:01 +0200 |
|---|---|---|
| committer | Florian Frank <flori@ping.de> | 2012-08-17 20:46:36 +0200 |
| commit | 24321292a85626ab2294d431b723103c838a3821 (patch) | |
| tree | 562da9564442ebf83bad3152474337c9249e6add | |
| parent | 6575bae67d46ef30d8ffa03e2d917e0f6c532002 (diff) | |
| download | json-24321292a85626ab2294d431b723103c838a3821.tar.gz | |
Move ruby macros into fbuffer.h
| -rw-r--r-- | ext/json/ext/fbuffer/fbuffer.h | 21 | ||||
| -rw-r--r-- | ext/json/ext/generator/generator.h | 21 | ||||
| -rw-r--r-- | json.gemspec | 2 | ||||
| -rw-r--r-- | json_pure.gemspec | 2 |
4 files changed, 23 insertions, 23 deletions
diff --git a/ext/json/ext/fbuffer/fbuffer.h b/ext/json/ext/fbuffer/fbuffer.h index 0c53296..b5e47ee 100644 --- a/ext/json/ext/fbuffer/fbuffer.h +++ b/ext/json/ext/fbuffer/fbuffer.h @@ -5,6 +5,27 @@ #include "ruby.h" #include <assert.h> +#ifndef RHASH_SIZE +#define RHASH_SIZE(hsh) (RHASH(hsh)->tbl->num_entries) +#endif + +#ifndef RFLOAT_VALUE +#define RFLOAT_VALUE(val) (RFLOAT(val)->value) +#endif + +#ifndef RARRAY_PTR +#define RARRAY_PTR(ARRAY) RARRAY(ARRAY)->ptr +#endif +#ifndef RARRAY_LEN +#define RARRAY_LEN(ARRAY) RARRAY(ARRAY)->len +#endif +#ifndef RSTRING_PTR +#define RSTRING_PTR(string) RSTRING(string)->ptr +#endif +#ifndef RSTRING_LEN +#define RSTRING_LEN(string) RSTRING(string)->len +#endif + #ifdef HAVE_RUBY_ENCODING_H #include "ruby/encoding.h" #define FORCE_UTF8(obj) rb_enc_associate((obj), rb_utf8_encoding()) diff --git a/ext/json/ext/generator/generator.h b/ext/json/ext/generator/generator.h index 901b62c..7d429d5 100644 --- a/ext/json/ext/generator/generator.h +++ b/ext/json/ext/generator/generator.h @@ -16,27 +16,6 @@ #define option_given_p(opts, key) RTEST(rb_funcall(opts, i_key_p, 1, key)) -#ifndef RHASH_SIZE -#define RHASH_SIZE(hsh) (RHASH(hsh)->tbl->num_entries) -#endif - -#ifndef RFLOAT_VALUE -#define RFLOAT_VALUE(val) (RFLOAT(val)->value) -#endif - -#ifndef RARRAY_PTR -#define RARRAY_PTR(ARRAY) RARRAY(ARRAY)->ptr -#endif -#ifndef RARRAY_LEN -#define RARRAY_LEN(ARRAY) RARRAY(ARRAY)->len -#endif -#ifndef RSTRING_PTR -#define RSTRING_PTR(string) RSTRING(string)->ptr -#endif -#ifndef RSTRING_LEN -#define RSTRING_LEN(string) RSTRING(string)->len -#endif - /* unicode defintions */ #define UNI_STRICT_CONVERSION 1 diff --git a/json.gemspec b/json.gemspec index 56cf442..b6d8026 100644 --- a/json.gemspec +++ b/json.gemspec @@ -6,7 +6,7 @@ Gem::Specification.new do |s| s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["Florian Frank"] - s.date = "2012-07-26" + s.date = "2012-08-17" s.description = "This is a JSON implementation as a Ruby extension in C." s.email = "flori@ping.de" s.extensions = ["ext/json/ext/generator/extconf.rb", "ext/json/ext/parser/extconf.rb"] diff --git a/json_pure.gemspec b/json_pure.gemspec index 8d1bc2d..f18804d 100644 --- a/json_pure.gemspec +++ b/json_pure.gemspec @@ -6,7 +6,7 @@ Gem::Specification.new do |s| s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["Florian Frank"] - s.date = "2012-07-26" + s.date = "2012-08-17" s.description = "This is a JSON implementation in pure Ruby." s.email = "flori@ping.de" s.extra_rdoc_files = ["README.rdoc"] |