summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-11-26 01:09:52 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-11-26 01:09:52 +0000
commitbb88a5a201e1a0b520f68d6861f5ce2d62c13fe9 (patch)
tree136b7d7cff07e56721995a288a83a20d9889874b
parent0b9471068286deef84638895a32b09845cc8a7d0 (diff)
* win32/Makefile.sub (WARNFLAGS): shut up the meaningless warnings of
Japanese version of VC. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@29935 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--win32/Makefile.sub1
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index a69bddd0c6..39399a9ad3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Nov 26 10:09:09 2010 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * win32/Makefile.sub (WARNFLAGS): shut up the meaningless warnings of
+ Japanese version of VC.
+
Fri Nov 26 10:08:24 2010 NAKAMURA Usaku <usa@ruby-lang.org>
* re.c (rb_reg_regcomp): should succeed the taint status from the
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 8c75cda0bf..2e9cb5b833 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -179,6 +179,7 @@ XCFLAGS = -DRUBY_EXPORT -I. -I$(srcdir) -I$(srcdir)/missing $(XCFLAGS)
!if $(MSC_VER) >= 1400
# Prevents VC++ 2005 (cl ver 14) warnings
CRTDEFFLAGS = -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE
+WARNFLAGS = $(WARNFLAGS) -wd4819
MANIFESTTOOL = mt -nologo
LDSHARED_1 = @if exist $(@).manifest $(MANIFESTTOOL) -manifest $(@).manifest -outputresource:$(@);2
LDSHARED_2 = @if exist $(@).manifest $(RM) $(@:/=\).manifest