From 82fa04e212dcff441d8ffa941fe2c252393db489 Mon Sep 17 00:00:00 2001 From: nobu Date: Sun, 15 Feb 2009 16:18:01 +0000 Subject: [PATCH] * win32/win32.c (_CrtDbgReportW): prevent from false positive assertions in msvcrtd. [ruby-core:22116] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22333 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ version.h | 4 ++-- win32/win32.c | 2 ++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index ae27a24746..8edb3d5739 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Feb 16 01:17:51 2009 Nobuyoshi Nakada + + * win32/win32.c (_CrtDbgReportW): prevent from false positive + assertions in msvcrtd. [ruby-core:22116] + Sun Feb 15 21:43:44 2009 Nobuyoshi Nakada * lib/ostruct.rb (OpenStruct#new_ostruct_member): checks if frozen. diff --git a/version.h b/version.h index 141dd42a27..2e2c4c386d 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.2" -#define RUBY_RELEASE_DATE "2009-02-15" +#define RUBY_RELEASE_DATE "2009-02-16" #define RUBY_PATCHLEVEL -1 #define RUBY_BRANCH_NAME "trunk" @@ -8,7 +8,7 @@ #define RUBY_VERSION_TEENY 1 #define RUBY_RELEASE_YEAR 2009 #define RUBY_RELEASE_MONTH 2 -#define RUBY_RELEASE_DAY 15 +#define RUBY_RELEASE_DAY 16 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; diff --git a/win32/win32.c b/win32/win32.c index 4c92ef19b9..ead75f37df 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -4873,3 +4873,5 @@ rb_w32_fsopen(const char *path, const char *mode, int shflags) return f; } #endif + +RUBY_EXTERN int __cdecl _CrtDbgReportW() {return 0;}