From 14cab32596d3e394cafea7a7698a81034b83c172 Mon Sep 17 00:00:00 2001 From: naruse Date: Wed, 20 Nov 2013 02:55:08 +0000 Subject: * ext/json: merge JSON 1.8.1. https://github.com/nurse/json/compare/002ac2771ce32776b32ccd2d06e5604de6c36dcd...e09ffc0d7da25d0393873936c118c188c78dbac3 * Remove Rubinius exception since transcoding should be working now. * Fix https://github.com/flori/json/issues/162 reported by Marc-Andre Lafortune . Thanks! * Applied patches by Yui NARUSE to suppress warning with -Wchar-subscripts and better validate UTF-8 strings. * Applied patch by ginriki@github to remove unnecessary if. * Add load/dump interface to JSON::GenericObject to make serialize :some_attribute, JSON::GenericObject work in Rails active models for convenient SomeModel#some_attribute.foo.bar access to serialised JSON data. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43731 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/json/parser/depend | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'ext/json/parser/depend') diff --git a/ext/json/parser/depend b/ext/json/parser/depend index 748b4213ae..498ffa964c 100644 --- a/ext/json/parser/depend +++ b/ext/json/parser/depend @@ -1,3 +1 @@ -parser.o: parser.c parser.rl $(HDRS) $(ruby_headers) $(srcdir)/../fbuffer/fbuffer.h \ - $(hdrdir)/ruby/encoding.h \ - $(hdrdir)/ruby/oniguruma.h \ +parser.o: parser.c parser.h $(srcdir)/../fbuffer/fbuffer.h -- cgit v1.2.3