From 43f6fdfb42d3f4c9025c290bdf5aeffe5959f1bf Mon Sep 17 00:00:00 2001
From: naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 12 Dec 2012 10:51:49 +0000
Subject: * ext/json: merge JSON 1.7.5.   fix tests and other fixes.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38346 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ext/json/generator/depend      |  2 +-
 ext/json/generator/generator.c |  2 +-
 ext/json/generator/generator.h | 21 ---------------------
 3 files changed, 2 insertions(+), 23 deletions(-)

(limited to 'ext/json/generator')

diff --git a/ext/json/generator/depend b/ext/json/generator/depend
index 1f0ea0a624..1a042a2501 100644
--- a/ext/json/generator/depend
+++ b/ext/json/generator/depend
@@ -1 +1 @@
-generator.o: generator.c generator.h $(srcdir)/../fbuffer/fbuffer.h $(ruby_headers)
+generator.o: generator.c generator.h $(srcdir)/../fbuffer/fbuffer.h
diff --git a/ext/json/generator/generator.c b/ext/json/generator/generator.c
index b1babb15f3..3cff87d7d5 100644
--- a/ext/json/generator/generator.c
+++ b/ext/json/generator/generator.c
@@ -864,7 +864,7 @@ static int isArrayOrObject(VALUE string)
     if (string_len < 2) return 0;
     for (; p < q && isspace(*p); p++);
     for (; q > p && isspace(*q); q--);
-    return *p == '[' && *q == ']' || *p == '{' && *q == '}';
+    return (*p == '[' && *q == ']') || (*p == '{' && *q == '}');
 }
 
 /*
diff --git a/ext/json/generator/generator.h b/ext/json/generator/generator.h
index 901b62c251..7d429d512c 100644
--- a/ext/json/generator/generator.h
+++ b/ext/json/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
-- 
cgit v1.2.3