ICU-3085 Change ICU to use the /Zc:wchar_t option.

X-SVN-Rev: 18994
2006-01-17 21:12:17 +00:00 · 2006-01-17 21:12:17 +00:00 · f9397a445c
commit f9397a445c
parent eb207fe76d
31 changed files with 81 additions and 2 deletions
--- a/icu4c/source/common/common.vcproj
+++ b/icu4c/source/common/common.vcproj
@ -27,6 +27,7 @@
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"
 				DisableLanguageExtensions="TRUE"
+				TreatWChar_tAsBuiltInType="TRUE"
 				PrecompiledHeaderFile=".\Release/common.pch"
 				AssemblerListingLocation=".\Release/"
 				ObjectFile=".\Release/"
@ -90,6 +91,7 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="TRUE"
 				DisableLanguageExtensions="TRUE"
+				TreatWChar_tAsBuiltInType="TRUE"
 				PrecompiledHeaderFile=".\Debug/common.pch"
 				AssemblerListingLocation=".\Debug/"
 				ObjectFile=".\Debug/"
--- a/icu4c/source/config/mh-cygwin-msvc
+++ b/icu4c/source/config/mh-cygwin-msvc
@ -1,5 +1,5 @@
 ## Cygwin with Microsoft Visual C++ compiler specific setup
-## Copyright (c) 2001-2005, International Business Machines Corporation and
+## Copyright (c) 2001-2006, International Business Machines Corporation and
 ## others. All Rights Reserved.

 # We install sbin tools into the same bin directory because
@ -37,8 +37,9 @@ endif

 # /GF pools strings and places them into read-only memory
 # /EHsc enables exception handling
+# /Zc:wchar_t makes wchar_t a native type. Required for C++ ABI compatibility.
 CFLAGS+=/GF
-CXXFLAGS+=/GF /EHsc
+CXXFLAGS+=/GF /EHsc /Zc:wchar_t
 CPPFLAGS+=/nologo
 DEFS+=-DWIN32
 LDFLAGS+=/nologo
--- a/icu4c/source/extra/uconv/uconv.vcproj
+++ b/icu4c/source/extra/uconv/uconv.vcproj
@ -26,6 +26,8 @@
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"
+				DisableLanguageExtensions="TRUE"
+				TreatWChar_tAsBuiltInType="TRUE"
 				PrecompiledHeaderFile=".\Release/uconv.pch"
 				AssemblerListingLocation=".\Release/"
 				ObjectFile=".\Release/"
@ -88,6 +90,8 @@
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				BufferSecurityCheck="TRUE"
+				DisableLanguageExtensions="TRUE"
+				TreatWChar_tAsBuiltInType="TRUE"
 				PrecompiledHeaderFile=".\Debug/uconv.pch"
 				AssemblerListingLocation=".\Debug/"
 				ObjectFile=".\Debug/"
--- a/icu4c/source/i18n/i18n.vcproj
+++ b/icu4c/source/i18n/i18n.vcproj
@ -27,6 +27,7 @@
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"
 				DisableLanguageExtensions="TRUE"
+				TreatWChar_tAsBuiltInType="TRUE"
 				PrecompiledHeaderFile=".\Release/i18n.pch"
 				AssemblerListingLocation=".\Release/"
 				ObjectFile=".\Release/"
@ -93,6 +94,7 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="TRUE"
 				DisableLanguageExtensions="TRUE"
+				TreatWChar_tAsBuiltInType="TRUE"
 				PrecompiledHeaderFile=".\Debug/i18n.pch"
 				AssemblerListingLocation=".\Debug/"
 				ObjectFile=".\Debug/"
--- a/icu4c/source/io/io.vcproj
+++ b/icu4c/source/io/io.vcproj
@ -27,6 +27,7 @@
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"
 				DisableLanguageExtensions="TRUE"
+				TreatWChar_tAsBuiltInType="TRUE"
 				PrecompiledHeaderFile=".\Release/icuio.pch"
 				AssemblerListingLocation=".\Release/"
 				ObjectFile=".\Release/"
@ -93,6 +94,7 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="TRUE"
 				DisableLanguageExtensions="TRUE"
+				TreatWChar_tAsBuiltInType="TRUE"
 				PrecompiledHeaderFile=".\Debug/icuio.pch"
 				AssemblerListingLocation=".\Debug/"
 				ObjectFile=".\Debug/"
--- a/icu4c/source/layout/layout.vcproj
+++ b/icu4c/source/layout/layout.vcproj
@ -28,6 +28,7 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="TRUE"
 				DisableLanguageExtensions="TRUE"
+				TreatWChar_tAsBuiltInType="TRUE"
 				PrecompiledHeaderFile=".\Debug/layout.pch"
 				AssemblerListingLocation=".\Debug/"
 				ObjectFile=".\Debug/"
@ -94,6 +95,7 @@
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"
 				DisableLanguageExtensions="TRUE"
+				TreatWChar_tAsBuiltInType="TRUE"
 				PrecompiledHeaderFile=".\Release/layout.pch"
 				AssemblerListingLocation=".\Release/"
 				ObjectFile=".\Release/"
--- a/icu4c/source/layoutex/layoutex.vcproj
+++ b/icu4c/source/layoutex/layoutex.vcproj
@ -26,6 +26,8 @@
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"
+				DisableLanguageExtensions="TRUE"
+				TreatWChar_tAsBuiltInType="TRUE"
 				PrecompiledHeaderFile=".\Release/layoutex.pch"
 				AssemblerListingLocation=".\Release/"
 				ObjectFile=".\Release/"
@ -89,6 +91,8 @@
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				BufferSecurityCheck="TRUE"
+				DisableLanguageExtensions="TRUE"
+				TreatWChar_tAsBuiltInType="TRUE"
 				PrecompiledHeaderFile=".\Debug/layoutex.pch"
 				AssemblerListingLocation=".\Debug/"
 				ObjectFile=".\Debug/"
--- a/icu4c/source/stubdata/stubdata.vcproj
+++ b/icu4c/source/stubdata/stubdata.vcproj
@ -27,6 +27,7 @@
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"
 				DisableLanguageExtensions="TRUE"
+				TreatWChar_tAsBuiltInType="TRUE"
 				PrecompiledHeaderFile=".\Release/stubdata.pch"
 				AssemblerListingLocation=".\Release/"
 				ObjectFile=".\Release/"
@ -91,6 +92,7 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="TRUE"
 				DisableLanguageExtensions="TRUE"
+				TreatWChar_tAsBuiltInType="TRUE"
 				PrecompiledHeaderFile=".\Debug/stubdata.pch"
 				AssemblerListingLocation=".\Debug/"
 				ObjectFile=".\Debug/"
--- a/icu4c/source/test/cintltst/cintltst.vcproj
+++ b/icu4c/source/test/cintltst/cintltst.vcproj
@ -28,6 +28,7 @@
 				RuntimeLibrary="1"
 				BufferSecurityCheck="TRUE"
 				DisableLanguageExtensions="TRUE"
+				TreatWChar_tAsBuiltInType="TRUE"
 				PrecompiledHeaderFile=".\Debug/cintltst.pch"
 				AssemblerListingLocation=".\Debug/"
 				ObjectFile=".\Debug/"
@ -90,6 +91,7 @@
 				BufferSecurityCheck="TRUE"
 				EnableFunctionLevelLinking="TRUE"
 				DisableLanguageExtensions="TRUE"
+				TreatWChar_tAsBuiltInType="TRUE"
 				PrecompiledHeaderFile=".\Release/cintltst.pch"
 				AssemblerListingLocation=".\Release/"
 				ObjectFile=".\Release/"
--- a/icu4c/source/test/intltest/intltest.vcproj
+++ b/icu4c/source/test/intltest/intltest.vcproj
@ -28,6 +28,7 @@
 				RuntimeLibrary="1"
 				BufferSecurityCheck="TRUE"
 				DisableLanguageExtensions="TRUE"
+				TreatWChar_tAsBuiltInType="TRUE"
 				PrecompiledHeaderFile=".\Debug/intltest.pch"
 				AssemblerListingLocation=".\Debug/"
 				ObjectFile=".\Debug/"
@ -88,6 +89,7 @@
 				StringPooling="TRUE"
 				RuntimeLibrary="0"
 				DisableLanguageExtensions="TRUE"
+				TreatWChar_tAsBuiltInType="TRUE"
 				PrecompiledHeaderFile=".\Release/intltest.pch"
 				AssemblerListingLocation=".\Release/"
 				ObjectFile=".\Release/"
--- a/icu4c/source/test/iotest/iotest.vcproj
+++ b/icu4c/source/test/iotest/iotest.vcproj
@ -29,6 +29,7 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="TRUE"
 				DisableLanguageExtensions="TRUE"
+				TreatWChar_tAsBuiltInType="TRUE"
 				PrecompiledHeaderFile=".\Debug/iotest.pch"
 				AssemblerListingLocation=".\Debug/"
 				ObjectFile=".\Debug/"
@ -90,6 +91,7 @@
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
 				DisableLanguageExtensions="TRUE"
+				TreatWChar_tAsBuiltInType="TRUE"
 				PrecompiledHeaderFile=".\Release/iotest.pch"
 				AssemblerListingLocation=".\Release/"
 				ObjectFile=".\Release/"
--- a/icu4c/source/tools/ctestfw/ctestfw.vcproj
+++ b/icu4c/source/tools/ctestfw/ctestfw.vcproj
@ -28,6 +28,7 @@
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"
 				DisableLanguageExtensions="TRUE"
+				TreatWChar_tAsBuiltInType="TRUE"
 				PrecompiledHeaderFile=".\Release/icutest.pch"
 				AssemblerListingLocation=".\Release/"
 				ObjectFile=".\Release/"
@ -91,6 +92,7 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="TRUE"
 				DisableLanguageExtensions="TRUE"
+				TreatWChar_tAsBuiltInType="TRUE"
 				PrecompiledHeaderFile=".\Debug/icutest.pch"
 				AssemblerListingLocation=".\Debug/"
 				ObjectFile=".\Debug/"
--- a/icu4c/source/tools/genbidi/genbidi.vcproj
+++ b/icu4c/source/tools/genbidi/genbidi.vcproj
@ -28,6 +28,7 @@
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"
 				DisableLanguageExtensions="TRUE"
+				TreatWChar_tAsBuiltInType="TRUE"
 				PrecompiledHeaderFile=".\Release/genbidi.pch"
 				AssemblerListingLocation=".\Release/"
 				ObjectFile=".\Release/"
@ -89,6 +90,7 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="TRUE"
 				DisableLanguageExtensions="TRUE"
+				TreatWChar_tAsBuiltInType="TRUE"
 				PrecompiledHeaderFile=".\Debug/genbidi.pch"
 				AssemblerListingLocation=".\Debug/"
 				ObjectFile=".\Debug/"
--- a/icu4c/source/tools/genbrk/genbrk.vcproj
+++ b/icu4c/source/tools/genbrk/genbrk.vcproj
@ -27,6 +27,7 @@
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"
 				DisableLanguageExtensions="TRUE"
+				TreatWChar_tAsBuiltInType="TRUE"
 				PrecompiledHeaderFile=".\Release/genbrk.pch"
 				AssemblerListingLocation=".\Release/"
 				ObjectFile=".\Release/"
@ -88,6 +89,7 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="TRUE"
 				DisableLanguageExtensions="TRUE"
+				TreatWChar_tAsBuiltInType="TRUE"
 				PrecompiledHeaderFile=".\Debug/genbrk.pch"
 				AssemblerListingLocation=".\Debug/"
 				ObjectFile=".\Debug/"
--- a/icu4c/source/tools/gencase/gencase.vcproj
+++ b/icu4c/source/tools/gencase/gencase.vcproj
@ -28,6 +28,7 @@
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"
 				DisableLanguageExtensions="TRUE"
+				TreatWChar_tAsBuiltInType="TRUE"
 				PrecompiledHeaderFile=".\Release/gencase.pch"
 				AssemblerListingLocation=".\Release/"
 				ObjectFile=".\Release/"
@ -89,6 +90,7 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="TRUE"
 				DisableLanguageExtensions="TRUE"
+				TreatWChar_tAsBuiltInType="TRUE"
 				PrecompiledHeaderFile=".\Debug/gencase.pch"
 				AssemblerListingLocation=".\Debug/"
 				ObjectFile=".\Debug/"
--- a/icu4c/source/tools/genccode/genccode.vcproj
+++ b/icu4c/source/tools/genccode/genccode.vcproj
@ -26,6 +26,7 @@
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"
+				TreatWChar_tAsBuiltInType="TRUE"
 				PrecompiledHeaderFile=".\Release/genccode.pch"
 				AssemblerListingLocation=".\Release/"
 				ObjectFile=".\Release/"
@ -86,6 +87,7 @@
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				BufferSecurityCheck="TRUE"
+				TreatWChar_tAsBuiltInType="TRUE"
 				PrecompiledHeaderFile=".\Debug/genccode.pch"
 				AssemblerListingLocation=".\Debug/"
 				ObjectFile=".\Debug/"
--- a/icu4c/source/tools/gencmn/gencmn.vcproj
+++ b/icu4c/source/tools/gencmn/gencmn.vcproj
@ -27,6 +27,7 @@
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"
 				DisableLanguageExtensions="TRUE"
+				TreatWChar_tAsBuiltInType="TRUE"
 				PrecompiledHeaderFile=".\Release/gencmn.pch"
 				AssemblerListingLocation=".\Release/"
 				ObjectFile=".\Release/"
@ -88,6 +89,7 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="TRUE"
 				DisableLanguageExtensions="TRUE"
+				TreatWChar_tAsBuiltInType="TRUE"
 				PrecompiledHeaderFile=".\Debug/gencmn.pch"
 				AssemblerListingLocation=".\Debug/"
 				ObjectFile=".\Debug/"
--- a/icu4c/source/tools/gencnval/gencnval.vcproj
+++ b/icu4c/source/tools/gencnval/gencnval.vcproj
@ -27,6 +27,7 @@
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"
 				DisableLanguageExtensions="TRUE"
+				TreatWChar_tAsBuiltInType="TRUE"
 				PrecompiledHeaderFile=".\Release/gencnval.pch"
 				AssemblerListingLocation=".\Release/"
 				ObjectFile=".\Release/"
@ -88,6 +89,7 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="TRUE"
 				DisableLanguageExtensions="TRUE"
+				TreatWChar_tAsBuiltInType="TRUE"
 				PrecompiledHeaderFile=".\Debug/gencnval.pch"
 				AssemblerListingLocation=".\Debug/"
 				ObjectFile=".\Debug/"
--- a/icu4c/source/tools/gennames/gennames.vcproj
+++ b/icu4c/source/tools/gennames/gennames.vcproj
@ -27,6 +27,7 @@
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"
 				DisableLanguageExtensions="TRUE"
+				TreatWChar_tAsBuiltInType="TRUE"
 				PrecompiledHeaderFile=".\Release/gennames.pch"
 				AssemblerListingLocation=".\Release/"
 				ObjectFile=".\Release/"
@ -88,6 +89,7 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="TRUE"
 				DisableLanguageExtensions="TRUE"
+				TreatWChar_tAsBuiltInType="TRUE"
 				PrecompiledHeaderFile=".\Debug/gennames.pch"
 				AssemblerListingLocation=".\Debug/"
 				ObjectFile=".\Debug/"
--- a/icu4c/source/tools/gennorm/gennorm.vcproj
+++ b/icu4c/source/tools/gennorm/gennorm.vcproj
@ -27,6 +27,7 @@
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"
 				DisableLanguageExtensions="TRUE"
+				TreatWChar_tAsBuiltInType="TRUE"
 				PrecompiledHeaderFile=".\Release/gennorm.pch"
 				AssemblerListingLocation=".\Release/"
 				ObjectFile=".\Release/"
@ -88,6 +89,7 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="TRUE"
 				DisableLanguageExtensions="TRUE"
+				TreatWChar_tAsBuiltInType="TRUE"
 				PrecompiledHeaderFile=".\Debug/gennorm.pch"
 				AssemblerListingLocation=".\Debug/"
 				ObjectFile=".\Debug/"
--- a/icu4c/source/tools/genpname/genpname.vcproj
+++ b/icu4c/source/tools/genpname/genpname.vcproj
@ -27,6 +27,7 @@
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"
 				DisableLanguageExtensions="TRUE"
+				TreatWChar_tAsBuiltInType="TRUE"
 				PrecompiledHeaderFile=".\Release/genpname.pch"
 				AssemblerListingLocation=".\Release/"
 				ObjectFile=".\Release/"
@ -88,6 +89,7 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="TRUE"
 				DisableLanguageExtensions="TRUE"
+				TreatWChar_tAsBuiltInType="TRUE"
 				PrecompiledHeaderFile=".\Debug/genpname.pch"
 				AssemblerListingLocation=".\Debug/"
 				ObjectFile=".\Debug/"
--- a/icu4c/source/tools/genprops/genprops.vcproj
+++ b/icu4c/source/tools/genprops/genprops.vcproj
@ -27,6 +27,7 @@
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"
 				DisableLanguageExtensions="TRUE"
+				TreatWChar_tAsBuiltInType="TRUE"
 				PrecompiledHeaderFile=".\Release/genprops.pch"
 				AssemblerListingLocation=".\Release/"
 				ObjectFile=".\Release/"
@ -88,6 +89,7 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="TRUE"
 				DisableLanguageExtensions="TRUE"
+				TreatWChar_tAsBuiltInType="TRUE"
 				PrecompiledHeaderFile=".\Debug/genprops.pch"
 				AssemblerListingLocation=".\Debug/"
 				ObjectFile=".\Debug/"
--- a/icu4c/source/tools/genrb/derb.vcproj
+++ b/icu4c/source/tools/genrb/derb.vcproj
@ -27,6 +27,7 @@
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"
 				DisableLanguageExtensions="TRUE"
+				TreatWChar_tAsBuiltInType="TRUE"
 				PrecompiledHeaderFile=".\derb_Win32_Release/derb.pch"
 				AssemblerListingLocation=".\derb_Win32_Release/"
 				ObjectFile=".\derb_Win32_Release/"
@ -92,6 +93,7 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="TRUE"
 				DisableLanguageExtensions="TRUE"
+				TreatWChar_tAsBuiltInType="TRUE"
 				PrecompiledHeaderFile=".\derb_Win32_Debug/derb.pch"
 				AssemblerListingLocation=".\derb_Win32_Debug/"
 				ObjectFile=".\derb_Win32_Debug/"
--- a/icu4c/source/tools/genrb/genrb.vcproj
+++ b/icu4c/source/tools/genrb/genrb.vcproj
@ -26,6 +26,7 @@
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
 				DisableLanguageExtensions="TRUE"
+				TreatWChar_tAsBuiltInType="TRUE"
 				PrecompiledHeaderFile=".\Release/genrb.pch"
 				AssemblerListingLocation=".\Release/"
 				ObjectFile=".\Release/"
@ -87,6 +88,7 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="TRUE"
 				DisableLanguageExtensions="TRUE"
+				TreatWChar_tAsBuiltInType="TRUE"
 				PrecompiledHeaderFile=".\Debug/genrb.pch"
 				AssemblerListingLocation=".\Debug/"
 				ObjectFile=".\Debug/"
--- a/icu4c/source/tools/gensprep/gensprep.vcproj
+++ b/icu4c/source/tools/gensprep/gensprep.vcproj
@ -27,6 +27,7 @@
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"
 				DisableLanguageExtensions="TRUE"
+				TreatWChar_tAsBuiltInType="TRUE"
 				PrecompiledHeaderFile=".\Release/gensprep.pch"
 				AssemblerListingLocation=".\Release/"
 				ObjectFile=".\Release/"
@ -88,6 +89,7 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="TRUE"
 				DisableLanguageExtensions="TRUE"
+				TreatWChar_tAsBuiltInType="TRUE"
 				PrecompiledHeaderFile=".\Debug/gensprep.pch"
 				AssemblerListingLocation=".\Debug/"
 				ObjectFile=".\Debug/"
--- a/icu4c/source/tools/gentest/gentest.vcproj
+++ b/icu4c/source/tools/gentest/gentest.vcproj
@ -27,6 +27,7 @@
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"
 				DisableLanguageExtensions="TRUE"
+				TreatWChar_tAsBuiltInType="TRUE"
 				PrecompiledHeaderFile=".\Release/gentest.pch"
 				AssemblerListingLocation=".\Release/"
 				ObjectFile=".\Release/"
@ -85,6 +86,7 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="TRUE"
 				DisableLanguageExtensions="TRUE"
+				TreatWChar_tAsBuiltInType="TRUE"
 				PrecompiledHeaderFile=".\Debug/gentest.pch"
 				AssemblerListingLocation=".\Debug/"
 				ObjectFile=".\Debug/"
--- a/icu4c/source/tools/genuca/genuca.vcproj
+++ b/icu4c/source/tools/genuca/genuca.vcproj
@ -28,6 +28,7 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="TRUE"
 				DisableLanguageExtensions="TRUE"
+				TreatWChar_tAsBuiltInType="TRUE"
 				PrecompiledHeaderFile=".\Debug/genuca.pch"
 				AssemblerListingLocation=".\Debug/"
 				ObjectFile=".\Debug/"
@ -91,6 +92,7 @@
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"
 				DisableLanguageExtensions="TRUE"
+				TreatWChar_tAsBuiltInType="TRUE"
 				PrecompiledHeaderFile=".\Release/genuca.pch"
 				AssemblerListingLocation=".\Release/"
 				ObjectFile=".\Release/"
--- a/icu4c/source/tools/icupkg/icupkg.vcproj
+++ b/icu4c/source/tools/icupkg/icupkg.vcproj
@ -27,6 +27,7 @@
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"
 				DisableLanguageExtensions="TRUE"
+				TreatWChar_tAsBuiltInType="TRUE"
 				PrecompiledHeaderFile="Release/icupkg.pch"
 				AssemblerListingLocation="Release/"
 				ObjectFile="Release/"
@ -86,6 +87,7 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="TRUE"
 				DisableLanguageExtensions="TRUE"
+				TreatWChar_tAsBuiltInType="TRUE"
 				PrecompiledHeaderFile="Debug/icupkg.pch"
 				AssemblerListingLocation="Debug/"
 				ObjectFile="Debug/"
--- a/icu4c/source/tools/makeconv/makeconv.vcproj
+++ b/icu4c/source/tools/makeconv/makeconv.vcproj
@ -28,6 +28,7 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="TRUE"
 				DisableLanguageExtensions="TRUE"
+				TreatWChar_tAsBuiltInType="TRUE"
 				PrecompiledHeaderFile=".\Debug/makeconv.pch"
 				AssemblerListingLocation=".\Debug/"
 				ObjectFile=".\Debug/"
@ -90,6 +91,7 @@
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
 				DisableLanguageExtensions="TRUE"
+				TreatWChar_tAsBuiltInType="TRUE"
 				PrecompiledHeaderFile=".\Release/makeconv.pch"
 				AssemblerListingLocation=".\Release/"
 				ObjectFile=".\Release/"
--- a/icu4c/source/tools/pkgdata/pkgdata.vcproj
+++ b/icu4c/source/tools/pkgdata/pkgdata.vcproj
@ -28,6 +28,7 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="TRUE"
 				DisableLanguageExtensions="TRUE"
+				TreatWChar_tAsBuiltInType="TRUE"
 				PrecompiledHeaderFile=".\Debug/pkgdata.pch"
 				AssemblerListingLocation=".\Debug/"
 				ObjectFile=".\Debug/"
@ -91,6 +92,7 @@
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"
 				DisableLanguageExtensions="TRUE"
+				TreatWChar_tAsBuiltInType="TRUE"
 				PrecompiledHeaderFile=".\Release/pkgdata.pch"
 				AssemblerListingLocation=".\Release/"
 				ObjectFile=".\Release/"
--- a/icu4c/source/tools/toolutil/toolutil.vcproj
+++ b/icu4c/source/tools/toolutil/toolutil.vcproj
@ -26,6 +26,8 @@
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"
+				DisableLanguageExtensions="TRUE"
+				TreatWChar_tAsBuiltInType="TRUE"
 				PrecompiledHeaderFile=".\Release/toolutil.pch"
 				AssemblerListingLocation=".\Release/"
 				ObjectFile=".\Release/"
@ -90,6 +92,8 @@
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				BufferSecurityCheck="TRUE"
+				DisableLanguageExtensions="TRUE"
+				TreatWChar_tAsBuiltInType="TRUE"
 				PrecompiledHeaderFile=".\Debug/toolutil.pch"
 				AssemblerListingLocation=".\Debug/"
 				ObjectFile=".\Debug/"
@ -162,6 +166,18 @@
 			</File>
 			<File
 				RelativePath=".\toolutil.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						DisableLanguageExtensions="FALSE"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						DisableLanguageExtensions="FALSE"/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\ucbuf.c">