summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-02-15 16:18:01 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-02-15 16:18:01 +0000
commit255aa954f56fdaa090716e24e4824976674f526d (patch)
treebc1aaa64ee876c92b1d7e906fc9927624c38e194
parent8d7828848b4b2f6f09d31c3e61720b9fb9e36627 (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/branches/ruby_1_8@22333 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--version.h6
-rw-r--r--win32/win32.c2
3 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 640f82dcb2..aca79ddf89 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.
diff --git a/version.h b/version.h
index a0c005fcc3..bd5aab411b 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
#define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2009-02-15"
+#define RUBY_RELEASE_DATE "2009-02-16"
#define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20090215
+#define RUBY_RELEASE_CODE 20090216
#define RUBY_PATCHLEVEL 5000
#define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
#define RUBY_VERSION_TEENY 7
#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 5c3baf3b01..0336398139 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -4216,3 +4216,5 @@ rb_w32_fsopen(const char *path, const char *mode, int shflags)
return f;
}
#endif
+
+RUBY_EXTERN int __cdecl _CrtDbgReportW() {return 0;}