summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--win32/Makefile.sub4
2 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 84e97512b01..f2beab2d9f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Mar 12 22:29:36 2009 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * win32/Makefile.sub (WARNFLAGS): warning 4996 is only in VC++8 or
+ later.
+
Thu Mar 12 22:14:01 2009 Tanaka Akira <akr@fsij.org>
* ext/openssl/ossl_ssl.c (ossl_ssl_def_const): use INT2NUM because
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index f6b757d50f6..37f9a8236f7 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -159,7 +159,11 @@ RUNTIMEFLAG = -MD
COMPILERFLAG = -Zm600
!endif
!if !defined(WARNFLAGS)
+!if $(MSC_VER) >= 1400
WARNFLAGS = -W2 -wd4996
+!else
+WARNFLAGS = -W2
+!endif
!endif
!if !defined(CFLAGS)
CFLAGS = $(RUNTIMEFLAG) $(DEBUGFLAGS) $(WARNFLAGS) $(OPTFLAGS) $(PROCESSOR_FLAG) $(COMPILERFLAG)