From db5a25f3f37afeeaa9c3c1f793ea0c26b26cef82 Mon Sep 17 00:00:00 2001 From: nobu Date: Tue, 25 Dec 2007 15:57:55 +0000 Subject: [PATCH] * ext/json/ext/generator/generator.c (Init_generator): requires json/common.rb for GeneratorError, when static linked. a patch from Kenta Murata in [ruby-dev:32789]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14710 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ ext/json/ext/generator/generator.c | 1 + version.h | 6 +++--- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index b77d871a4b..61415d6045 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Wed Dec 26 00:57:53 2007 Nobuyoshi Nakada + + * ext/json/ext/generator/generator.c (Init_generator): requires + json/common.rb for GeneratorError, when static linked. a patch from + Kenta Murata in [ruby-dev:32789]. + Tue Dec 25 23:33:55 2007 Yukihiro Matsumoto * development version 1.9.0 released. diff --git a/ext/json/ext/generator/generator.c b/ext/json/ext/generator/generator.c index 6bc37e38cb..97b06e983f 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"); diff --git a/version.h b/version.h index 46fada7b70..4e2eb8221e 100644 --- a/version.h +++ b/version.h @@ -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[];