ruby-changes:23902
From: shyouhei <ko1@a...>
Date: Thu, 7 Jun 2012 19:06:09 +0900 (JST)
Subject: [ruby-changes:23902] shyouhei:r35953 (ruby_1_8_7): merge revision(s) 30993:
shyouhei 2012-06-07 19:05:59 +0900 (Thu, 07 Jun 2012) New Revision: 35953 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=35953 Log: merge revision(s) 30993: * ext/bigdecimal/bigdecimal.c (VpMemAlloc): Fixes a bug reported by Drew Yao <ayao at apple.com> Modified files: branches/ruby_1_8_7/ChangeLog branches/ruby_1_8_7/ext/bigdecimal/bigdecimal.c branches/ruby_1_8_7/version.h Index: ruby_1_8_7/ext/bigdecimal/bigdecimal.c =================================================================== --- ruby_1_8_7/ext/bigdecimal/bigdecimal.c (revision 35952) +++ ruby_1_8_7/ext/bigdecimal/bigdecimal.c (revision 35953) @@ -2032,11 +2032,11 @@ VP_EXPORT void * VpMemAlloc(U_LONG mb) { - void *p = xmalloc((unsigned int)mb); - if(!p) { - VpException(VP_EXCEPTION_MEMORY,"failed to allocate memory",1); + void *p = xmalloc(mb); + if (!p) { + VpException(VP_EXCEPTION_MEMORY, "failed to allocate memory", 1); } - memset(p,0,mb); + memset(p, 0, mb); #ifdef _DEBUG gnAlloc++; /* Count allocation call */ #endif /* _DEBUG */ Index: ruby_1_8_7/ChangeLog =================================================================== --- ruby_1_8_7/ChangeLog (revision 35952) +++ ruby_1_8_7/ChangeLog (revision 35953) @@ -1,3 +1,8 @@ +Thu Jun 7 19:00:35 2012 Kenta Murata <mrkn@m...> + + * ext/bigdecimal/bigdecimal.c (VpMemAlloc): Fixes a bug reported + by Drew Yao <ayao at apple.com> + Wed Jun 6 15:09:00 2012 Nobuyoshi Nakada <nobu@r...> * eval.c (rb_thread_join), ext/thread/thread.c (wake_one): adjusts Index: ruby_1_8_7/version.h =================================================================== --- ruby_1_8_7/version.h (revision 35952) +++ ruby_1_8_7/version.h (revision 35953) @@ -1,15 +1,15 @@ #define RUBY_VERSION "1.8.7" -#define RUBY_RELEASE_DATE "2012-06-06" +#define RUBY_RELEASE_DATE "2012-06-07" #define RUBY_VERSION_CODE 187 -#define RUBY_RELEASE_CODE 20120606 -#define RUBY_PATCHLEVEL 366 +#define RUBY_RELEASE_CODE 20120607 +#define RUBY_PATCHLEVEL 367 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_TEENY 7 #define RUBY_RELEASE_YEAR 2012 #define RUBY_RELEASE_MONTH 6 -#define RUBY_RELEASE_DAY 6 +#define RUBY_RELEASE_DAY 7 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/