diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-05-07 08:46:50 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-05-07 08:46:50 +0000 |
| commit | 251001c8298412def115fc10e0798f283956b5c7 (patch) | |
| tree | 5c225ec1084b6fe84e38d9886c50d6180b653afc | |
| parent | e9231035b2db3e693b1f3731424152bb2f3e3a16 (diff) | |
Revert r35560.
This breaks tests:
http://u64.rubyci.org/~chkbuild/ruby-trunk/log/20120507T070102Z.log.html.gz
And don't change local codes, contribute it to upstream:
https://github.com/flori/json
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35562 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | ext/json/fbuffer/fbuffer.h | 8 | ||||
| -rw-r--r-- | ext/json/parser/depend | 2 |
3 files changed, 1 insertions, 13 deletions
@@ -1,7 +1,3 @@ -Mon May 7 17:24:01 2012 NAKAMURA Usaku <usa@ruby-lang.org> - - * ext/json/parser/depend: need to specify the base directory for nmake. - Mon May 7 13:41:00 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> * Makefile.in (PROGRAM), configure.in (POSTLINK): sign built program diff --git a/ext/json/fbuffer/fbuffer.h b/ext/json/fbuffer/fbuffer.h index a03968a4fc..47e0c07004 100644 --- a/ext/json/fbuffer/fbuffer.h +++ b/ext/json/fbuffer/fbuffer.h @@ -35,14 +35,10 @@ static FBuffer *fbuffer_alloc(unsigned long initial_length); static void fbuffer_free(FBuffer *fb); static void fbuffer_clear(FBuffer *fb); static void fbuffer_append(FBuffer *fb, const char *newstr, unsigned long len); -#if 0 static void fbuffer_append_long(FBuffer *fb, long number); -#endif static void fbuffer_append_char(FBuffer *fb, char newchr); -#if 0 static FBuffer *fbuffer_dup(FBuffer *fb); static VALUE fbuffer_to_s(FBuffer *fb); -#endif static FBuffer *fbuffer_alloc(unsigned long initial_length) { @@ -92,7 +88,6 @@ static void fbuffer_append(FBuffer *fb, const char *newstr, unsigned long len) } } -#if 0 static void fbuffer_append_str(FBuffer *fb, VALUE str) { const char *newstr = StringValuePtr(str); @@ -102,7 +97,6 @@ static void fbuffer_append_str(FBuffer *fb, VALUE str) RB_GC_GUARD(str); } -#endif static void fbuffer_append_char(FBuffer *fb, char newchr) { @@ -111,7 +105,6 @@ static void fbuffer_append_char(FBuffer *fb, char newchr) fb->len++; } -#if 0 static void freverse(char *start, char *end) { char c; @@ -162,4 +155,3 @@ static VALUE fbuffer_to_s(FBuffer *fb) return result; } #endif -#endif diff --git a/ext/json/parser/depend b/ext/json/parser/depend index 498ffa964c..5eaf6dd040 100644 --- a/ext/json/parser/depend +++ b/ext/json/parser/depend @@ -1 +1 @@ -parser.o: parser.c parser.h $(srcdir)/../fbuffer/fbuffer.h +parser.o: parser.c parser.h |