From e1519fddbe540bc02f094f22ef01bfe4b60b3151 Mon Sep 17 00:00:00 2001
From: "SND\\weimingzhi_cp"
 <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>
Date: Mon, 24 May 2010 03:08:15 +0000
Subject: silence msvc6 warnings

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@48644 e17a0e51-4ae3-4d35-97c3-1a29b211df97
---
 ChangeLog      | 3 ++-
 win32/config.h | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

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)
-- 
cgit v1.2.3