diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-02-14 06:51:49 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-02-14 06:51:49 +0000 |
| commit | 681d225d26704637cffb241fb8c88a76209d8798 (patch) | |
| tree | 00cbf533a2a4292c1bf0e5b40cac7420744a4bb9 | |
| parent | 30a1b86e68d549a7013277b7b57ea5692b57c07b (diff) | |
| download | ruby-681d225d26704637cffb241fb8c88a76209d8798.tar.gz | |
merge revision(s) 44514: [Backport #9374]
* ext/json/generator/depend: add build dependencies for json extension
[Bug #9374] [ruby-core:59609]
* ext/json/parser/depend: ditto
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@44947 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ext/json/generator/depend | 1 | ||||
| -rw-r--r-- | ext/json/parser/depend | 1 | ||||
| -rw-r--r-- | version.h | 2 |
4 files changed, 9 insertions, 1 deletions
@@ -1,3 +1,9 @@ +Fri Feb 14 15:49:55 2014 Eric Wong <e@80x24.org> + + * ext/json/generator/depend: add build dependencies for json extension + [Bug #9374] [ruby-core:59609] + * ext/json/parser/depend: ditto + Fri Feb 14 15:40:32 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> * iseq.c (iseq_load): keep type_map to get rid of memory leak. diff --git a/ext/json/generator/depend b/ext/json/generator/depend index bb76ad6400..563fa435d5 100644 --- a/ext/json/generator/depend +++ b/ext/json/generator/depend @@ -1 +1,2 @@ +$(OBJS): $(ruby_headers) generator.o: generator.c generator.h diff --git a/ext/json/parser/depend b/ext/json/parser/depend index 5eaf6dd040..c0d4fc834f 100644 --- a/ext/json/parser/depend +++ b/ext/json/parser/depend @@ -1 +1,2 @@ +$(OBJS): $(ruby_headers) parser.o: parser.c parser.h @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 527 +#define RUBY_PATCHLEVEL 528 #define RUBY_RELEASE_DATE "2014-02-14" #define RUBY_RELEASE_YEAR 2014 |