diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-25 15:57:55 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-25 15:57:55 +0000 |
| commit | aa266d0c73a1a8756ed04270b43197d787c6f417 (patch) | |
| tree | d6614d17f95552ad3c70663ddee51ab8aa081f10 | |
| parent | e12d10d2a717ab4790244d0e0a1174bac2c65450 (diff) | |
| download | ruby-aa266d0c73a1a8756ed04270b43197d787c6f417.tar.gz ruby-aa266d0c73a1a8756ed04270b43197d787c6f417.tar.xz ruby-aa266d0c73a1a8756ed04270b43197d787c6f417.zip | |
* ext/json/ext/generator/generator.c (Init_generator): requires
json/common.rb for GeneratorError, when static linked. a patch from
Kenta Murata <muraken AT gmail.com> in [ruby-dev:32789].
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@14710 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ext/json/ext/generator/generator.c | 1 | ||||
| -rw-r--r-- | version.h | 6 |
3 files changed, 10 insertions, 3 deletions
@@ -1,3 +1,9 @@ +Wed Dec 26 00:57:53 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * ext/json/ext/generator/generator.c (Init_generator): requires + json/common.rb for GeneratorError, when static linked. a patch from + Kenta Murata <muraken AT gmail.com> in [ruby-dev:32789]. + Tue Dec 25 23:33:55 2007 Yukihiro Matsumoto <matz@ruby-lang.org> * development version 1.9.0 released. diff --git a/ext/json/ext/generator/generator.c b/ext/json/ext/generator/generator.c index 6bc37e38c..97b06e983 100644 --- a/ext/json/ext/generator/generator.c +++ b/ext/json/ext/generator/generator.c @@ -802,6 +802,7 @@ static VALUE cState_forget(VALUE self, VALUE object) */ void Init_generator() { + rb_require("json/common"); mJSON = rb_define_module("JSON"); mExt = rb_define_module_under(mJSON, "Ext"); mGenerator = rb_define_module_under(mExt, "Generator"); @@ -1,7 +1,7 @@ #define RUBY_VERSION "1.9.0" -#define RUBY_RELEASE_DATE "2007-12-25" +#define RUBY_RELEASE_DATE "2007-12-26" #define RUBY_VERSION_CODE 190 -#define RUBY_RELEASE_CODE 20071225 +#define RUBY_RELEASE_CODE 20071226 #define RUBY_PATCHLEVEL 0 #define RUBY_VERSION_MAJOR 1 @@ -9,7 +9,7 @@ #define RUBY_VERSION_TEENY 0 #define RUBY_RELEASE_YEAR 2007 #define RUBY_RELEASE_MONTH 12 -#define RUBY_RELEASE_DAY 25 +#define RUBY_RELEASE_DAY 26 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; |