diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-15 16:18:01 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-15 16:18:01 +0000 |
commit | 82fa04e212dcff441d8ffa941fe2c252393db489 (patch) | |
tree | 6b53bf8c0ad834eae28560c351681fb8a990aeca | |
parent | a4eb3395643835b87c504701f2964ae461a5727c (diff) |
* 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
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | version.h | 4 | ||||
-rw-r--r-- | win32/win32.c | 2 |
3 files changed, 9 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Mon Feb 16 01:17:51 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * win32/win32.c (_CrtDbgReportW): prevent from false positive + assertions in msvcrtd. [ruby-core:22116] + Sun Feb 15 21:43:44 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * lib/ostruct.rb (OpenStruct#new_ostruct_member): checks if frozen. @@ -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;} |