summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChun-wei Fan <fanchunwei@src.gnome.org>2012-06-20 10:19:14 +0800
committerChun-wei Fan <fanchunwei@src.gnome.org>2012-06-20 10:19:14 +0800
commit599d1a430e787f7cda929b8b0188a01f39453e66 (patch)
tree52e02a7bd7b3e9a8ead2d7b1d0a7f7c990225be2
parent7cf38c6ad76f5b343614bba9d31f683b7edb0620 (diff)
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.
-rw-r--r--build/win32/vs10/README.txt7
-rw-r--r--build/win32/vs9/README.txt7
-rw-r--r--msvc_recommended_pragmas.h3
3 files changed, 14 insertions, 3 deletions
diff --git a/build/win32/vs10/README.txt b/build/win32/vs10/README.txt
index 69da5f4e1..b5e092f07 100644
--- 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
from a specific GLib source tree.
+Note: If you see C4819 warnings and you are compiling GLib on a DBCS
+(Chinese/Korean/Japanese) version of Windows, you may need to switch
+to an English locale in Control Panel->Region and Languages->System->
+Change System Locale, reboot and rebuild to ensure GLib, Pango, GDK-Pixbuf,
+ATK and GTK+ is built correctly. This is due to a bug in Visual C++ running
+on DBCS locales.
+
--Tor Lillqvist <tml@iki.fi>
--Updated by Chun-wei Fan <fanc999@gmail.com>
diff --git a/build/win32/vs9/README.txt b/build/win32/vs9/README.txt
index d760ce8ad..59e77b28a 100644
--- 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
from a specific GLib source tree.
+Note: If you see C4819 warnings and you are compiling GLib on a DBCS
+(Chinese/Korean/Japanese) version of Windows, you may need to switch
+to an English locale in Control Panel->Region and Languages->System->
+Change System Locale, reboot and rebuild to ensure GLib, Pango, GDK-Pixbuf,
+ATK and GTK+ is built correctly. This is due to a bug in Visual C++ running
+on DBCS locales.
+
--Tor Lillqvist <tml@iki.fi>
--Updated by Chun-wei Fan <fanc999@gmail.com>
diff --git a/msvc_recommended_pragmas.h b/msvc_recommended_pragmas.h
index ff4028e2d..f78f9a1ca 100644
--- 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