From 613c7aa520a579f0a0312d32b617e0ee4efe04cf Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 15 Jan 2009 15:39:16 +0000
Subject: merges r21518 from trunk into ruby_1_9_1. 	* win32/Makefile.sub
 (COMPILERFLAG): for enc/trans/gb18030.c.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@21561 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog          | 4 ++++
 win32/Makefile.sub | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index cea50d20c..d3e687d50 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Jan 15 13:10:58 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/Makefile.sub (COMPILERFLAG): for enc/trans/gb18030.c.
+
 Thu Jan 15 00:06:12 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* enc/trans/gb18030.trans: get rid of a 1.9 feature for cross
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index a3eef90bb..e0d8933e2 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -153,7 +153,7 @@ COUTFLAG      = -Fo
 RUNTIMEFLAG   = -MD
 !endif
 !if !defined(COMPILERFLAG)
-COMPILERFLAG  = -Zm200
+COMPILERFLAG  = -Zm600
 !endif
 !if !defined(CFLAGS)
 CFLAGS = $(RUNTIMEFLAG) $(DEBUGFLAGS) $(WARNFLAGS) $(OPTFLAGS) $(PROCESSOR_FLAG) $(COMPILERFLAG)
-- 
cgit