# HG changeset patch
# User zgu
# Date 1293461789 18000
# Node ID dbf8dcf069d1723e0b7255e2802a715ca04a0d81
# Parent  e0c969b97f66a3f41712f01f112eade13dac793e# Parent  d6cd0d55d0b54d22f88255a9d4a7bc951e349696
Merge

diff -r d6cd0d55d0b5 -r dbf8dcf069d1 make/windows/makefiles/compile.make
--- a/make/windows/makefiles/compile.make	Thu Dec 23 07:58:35 2010 -0800
+++ b/make/windows/makefiles/compile.make	Mon Dec 27 09:56:29 2010 -0500
@@ -152,7 +152,7 @@
 !endif
 
 # Always add the _STATIC_CPPLIB flag
-STATIC_CPPLIB_OPTION = /D _STATIC_CPPLIB
+STATIC_CPPLIB_OPTION = /D _STATIC_CPPLIB /D _DISABLE_DEPRECATE_STATIC_CPPLIB
 MS_RUNTIME_OPTION = $(MS_RUNTIME_OPTION) $(STATIC_CPPLIB_OPTION)
 CPP_FLAGS=$(CPP_FLAGS) $(MS_RUNTIME_OPTION)