msvc_recommended_pragmas.h: Re-enable C4819 warnings

Apparently the C4819 warnings appear due to a bug on Visual C++ on DBCS
locales, so re-enable this.

Add a note in the Visual C++ Readme.txt's regarding this.

diff --git a/build/win32/vs10/README.txt b/build/win32/vs10/README.txt
index 69da5f4e16801dd474af5c38ecb10131f3cdbbf5..b5e092f0757c081e2bba5097dcc58237ff106176 100644 (file)
--- a/build/win32/vs10/README.txt
+++ b/build/win32/vs10/README.txt
@@ -73,5 +73,12 @@ built DLLs go into <root>\vs10\<PlatformName>\bin, built LIBs into
 project files higher in the stack are supposed to look for them, not\r
 from a specific GLib source tree.\r
 \r
+Note: If you see C4819 warnings and you are compiling GLib on a DBCS\r
+(Chinese/Korean/Japanese) version of Windows, you may need to switch\r
+to an English locale in Control Panel->Region and Languages->System->\r
+Change System Locale, reboot and rebuild to ensure GLib, Pango, GDK-Pixbuf,\r
+ATK and GTK+ is built correctly.  This is due to a bug in Visual C++ running\r
+on DBCS locales.\r
+\r
 --Tor Lillqvist <tml@iki.fi>\r
 --Updated by Chun-wei Fan <fanc999@gmail.com>\r

diff --git a/build/win32/vs9/README.txt b/build/win32/vs9/README.txt
index d760ce8adaa0c30d466639c4da3ea609e82ece59..59e77b28a97c801331b1967591daa05102acd4a7 100644 (file)
--- a/build/win32/vs9/README.txt
+++ b/build/win32/vs9/README.txt
@@ -73,5 +73,12 @@ built DLLs go into <root>\vs9\<PlatformName>\bin, built LIBs into
 project files higher in the stack are supposed to look for them, not\r
 from a specific GLib source tree.\r
 \r
+Note: If you see C4819 warnings and you are compiling GLib on a DBCS\r
+(Chinese/Korean/Japanese) version of Windows, you may need to switch\r
+to an English locale in Control Panel->Region and Languages->System->\r
+Change System Locale, reboot and rebuild to ensure GLib, Pango, GDK-Pixbuf,\r
+ATK and GTK+ is built correctly.  This is due to a bug in Visual C++ running\r
+on DBCS locales.\r
+\r
 --Tor Lillqvist <tml@iki.fi>\r
 --Updated by Chun-wei Fan <fanc999@gmail.com>\r

diff --git a/msvc_recommended_pragmas.h b/msvc_recommended_pragmas.h
index ff4028e2dfe9dcf41afa85418b1b6203fb9e3cb9..f78f9a1cab16813f36c9d8b64bcfb5c497700e87 100644 (file)
--- a/msvc_recommended_pragmas.h
+++ b/msvc_recommended_pragmas.h
@@ -27,9 +27,6 @@
 #pragma warning(disable:4244)  /* No possible loss of data warnings */
 #pragma warning(disable:4305)   /* No truncation from int to char warnings */
 
-/* The file contains a character that cannot be represented in the current code page */
-#pragma warning(disable:4819)
-
 /* work around Microsoft's premature attempt to deprecate the C-Library */
 #define _CRT_SECURE_NO_WARNINGS
 #define _CRT_NONSTDC_NO_WARNINGS