diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-11-20 02:55:08 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-11-20 02:55:08 +0000 |
commit | 14cab32596d3e394cafea7a7698a81034b83c172 (patch) | |
tree | 672a0450700e77f4d0129f781ce24c1799a773fa /ext/json/parser/depend | |
parent | 9d740ddebeaa46f47c9b4529e8b36d72d97f9105 (diff) |
* 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 <github_rocks@marc-andre.ca>. Thanks!
* Applied patches by Yui NARUSE <naruse@airemix.jp> 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
Diffstat (limited to 'ext/json/parser/depend')
-rw-r--r-- | ext/json/parser/depend | 4 |
1 files changed, 1 insertions, 3 deletions
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 |