summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2010-05-24 03:08:15 +0000
committerSND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2010-05-24 03:08:15 +0000
commite1519fddbe540bc02f094f22ef01bfe4b60b3151 (patch)
tree1530ee4b937ce81aa439654845c9fb27b873f7a6
parent99928442aabc917ef3d98d8ce576563e52575297 (diff)
downloadpcsxr-e1519fddbe540bc02f094f22ef01bfe4b60b3151.tar.gz
silence msvc6 warnings
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@48644 e17a0e51-4ae3-4d35-97c3-1a29b211df97
-rw-r--r--ChangeLog3
-rw-r--r--win32/config.h1
2 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f6d90f84..9792f245 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,7 +3,8 @@ May 24, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
* win32/gui/WndMain.c: Also show Japanese titles properly for Windows
(need to set ACP to east-asian languages).
* win32/intl/gettext.c: Added a hack for UTF-8 support.
- * win32/gui/AboutDlg.c: Updated info.
+ * win32/gui/AboutDlg.c: Updated info.
+ * win32/config.h: Silenced MSVC6 warnings.
May 23, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
diff --git a/win32/config.h b/win32/config.h
index 154897da..f13d3e89 100644
--- a/win32/config.h
+++ b/win32/config.h
@@ -40,6 +40,7 @@
#ifdef _MSC_VER
#pragma warning (disable:4133)
+#pragma warning (disable:4142)
#pragma warning (disable:4244)
#pragma warning (disable:4996)
#pragma warning (disable:4018)