9 files changed, 19 insertions, 20 deletions
diff --git a/plugins/CountryFlags/src/extraimg.cpp b/plugins/CountryFlags/src/extraimg.cpp
index 9e9d0dd307..b57a382ea4 100644
--- a/plugins/CountryFlags/src/extraimg.cpp
+++ b/plugins/CountryFlags/src/extraimg.cpp
@@ -17,14 +17,14 @@ along with this program (Flags-License.txt); if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
-#include "flags.h"
+#include "stdafx.h"
 
 /* Services */
 static HANDLE hServiceDetectContactOrigin;
 
 /************************* Services *******************************/
 
-static INT_PTR ServiceDetectContactOriginCountry(WPARAM hContact, LPARAM lParam)
+static INT_PTR ServiceDetectContactOriginCountry(WPARAM hContact, LPARAM)
 {
 	int countryNumber = 0xFFFF;
 	char *pszProto = GetContactProto(hContact);
@@ -114,7 +114,7 @@ static void __fastcall UnsetStatusIcon(MCONTACT hContact)
 	Srmm_ModifyIcon(hContact, &sid);
 }
 
-static int MsgWndEvent(WPARAM wParam,LPARAM lParam)
+static int MsgWndEvent(WPARAM, LPARAM lParam)
 {
 	MessageWindowEventData *msgwe=(MessageWindowEventData*)lParam;
 	switch(msgwe->uType) {
@@ -153,7 +153,7 @@ void CALLBACK UpdateStatusIcons(LPARAM)
 	}
 }
 
-static int StatusIconsChanged(WPARAM wParam,LPARAM lParam)
+static int StatusIconsChanged(WPARAM, LPARAM)
 {
 	if (bShowStatusIcon)
 		CallFunctionBuffered(UpdateStatusIcons, 0, FALSE, STATUSICON_REFRESHDELAY);
@@ -178,7 +178,7 @@ static int ExtraImgSettingChanged(WPARAM hContact, LPARAM lParam)
 
 /************************* Misc ***********************************/
 
-static int ExtraImgModulesLoaded(WPARAM wParam,LPARAM lParam)
+static int ExtraImgModulesLoaded(WPARAM, LPARAM)
 {
 	/* Status Icon */
 	StatusIconData sid = { sizeof(sid) };
diff --git a/plugins/CountryFlags/src/huffman.cpp b/plugins/CountryFlags/src/huffman.cpp
index da02e9f97d..c264289735 100644
--- a/plugins/CountryFlags/src/huffman.cpp
+++ b/plugins/CountryFlags/src/huffman.cpp
@@ -60,7 +60,7 @@
 * Types used for Huffman coding
 *************************************************************************/
 
-#include "flags.h"
+#include "stdafx.h"
 
 typedef struct {
     unsigned char *BytePtr;
diff --git a/plugins/CountryFlags/src/icons.cpp b/plugins/CountryFlags/src/icons.cpp
index 6471ab79db..5b4e8affac 100644
--- a/plugins/CountryFlags/src/icons.cpp
+++ b/plugins/CountryFlags/src/icons.cpp
@@ -17,7 +17,7 @@ along with this program (Flags-License.txt); if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
-#include "flags.h"
+#include "stdafx.h"
 
 /************************* Bitmap Access **************************/
 
diff --git a/plugins/CountryFlags/src/ip2country.cpp b/plugins/CountryFlags/src/ip2country.cpp
index dad6b0b1d8..e233fbbf17 100644
--- a/plugins/CountryFlags/src/ip2country.cpp
+++ b/plugins/CountryFlags/src/ip2country.cpp
@@ -17,7 +17,7 @@ along with this program (Flags-License.txt); if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
-#include "flags.h"
+#include "stdafx.h"
 
 extern HINSTANCE hInst;
 extern int nCountriesCount;
@@ -58,7 +58,7 @@ static BYTE *dataRecords;       /* protected by csRecordCache */
 
 #define UNLOADDELAY  30*1000  /* time after which the data records are being unloaded */
 
-static void CALLBACK UnloadRecordCache(LPARAM lParam)
+static void CALLBACK UnloadRecordCache(LPARAM)
 {
 	EnterCriticalSection(&csRecordCache);
 	mir_free(dataRecords);
@@ -97,7 +97,7 @@ static void LeaveRecordCache(void)
 /************************* Services *******************************/
 
 
-INT_PTR ServiceIpToCountry(WPARAM wParam,LPARAM lParam)
+INT_PTR ServiceIpToCountry(WPARAM wParam, LPARAM)
 {
 	BYTE *data;
 	DWORD dwFrom,dwTo;
diff --git a/plugins/CountryFlags/src/main.cpp b/plugins/CountryFlags/src/main.cpp
index 216595c441..674e60f913 100644
--- a/plugins/CountryFlags/src/main.cpp
+++ b/plugins/CountryFlags/src/main.cpp
@@ -17,7 +17,7 @@ along with this program (Flags-License.txt); if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
-#include "flags.h"
+#include "stdafx.h"
 
 int nCountriesCount;
 CountryListEntry *countries;
@@ -39,13 +39,13 @@ static PLUGININFOEX pluginInfo={
 	{0x68c36842, 0x3d95, 0x4f4a, {0xab, 0x81, 0x1, 0x4d, 0x65, 0x93, 0x86, 0x3b}}
 };
 
-BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
+BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD, LPVOID)
 {
 	hInst = hinstDLL;
 	return TRUE;
 }
 
-extern "C" __declspec(dllexport) const PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion)
+extern "C" __declspec(dllexport) const PLUGININFOEX* MirandaPluginInfoEx(DWORD)
 {
 	return &pluginInfo;
 }
diff --git a/plugins/CountryFlags/src/options.cpp b/plugins/CountryFlags/src/options.cpp
index f87979b172..ed8c02eb7f 100644
--- a/plugins/CountryFlags/src/options.cpp
+++ b/plugins/CountryFlags/src/options.cpp
@@ -17,13 +17,13 @@ along with this program (Flags-License.txt); if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
-#include "flags.h"
+#include "stdafx.h"
 
 bool bUseUnknown, bShowStatusIcon, bShowExtraIcon, bUseIpToCountry;
 
 #define M_ENABLE_SUBCTLS  (WM_APP+1)
 
-static INT_PTR CALLBACK ExtraImgOptDlgProc(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM lParam)
+static INT_PTR CALLBACK ExtraImgOptDlgProc(HWND hwndDlg,UINT msg,WPARAM,LPARAM lParam)
 {
 	switch(msg) {
 	case WM_INITDIALOG:
@@ -80,7 +80,7 @@ static INT_PTR CALLBACK ExtraImgOptDlgProc(HWND hwndDlg,UINT msg,WPARAM wParam,L
 	return FALSE;
 }
 
-int OnOptionsInit(WPARAM wParam, LPARAM lParam)
+int OnOptionsInit(WPARAM wParam, LPARAM)
 {
 	OPTIONSDIALOGPAGE odp = { 0 };
 	odp.hInstance = hInst;
diff --git a/plugins/CountryFlags/src/stdafx.cpp b/plugins/CountryFlags/src/stdafx.cxx
index 0f9092351c..6fb37564b7 100644
--- a/plugins/CountryFlags/src/stdafx.cpp
+++ b/plugins/CountryFlags/src/stdafx.cxx
@@ -15,4 +15,4 @@ You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "flags.h"
-\ No newline at end of file
+#include "stdafx.h"
+\ No newline at end of file
diff --git a/plugins/CountryFlags/src/flags.h b/plugins/CountryFlags/src/stdafx.h
index b3707233f2..dc1911ef8b 100644
--- a/plugins/CountryFlags/src/flags.h
+++ b/plugins/CountryFlags/src/stdafx.h
@@ -17,7 +17,6 @@ along with this program (Flags-License.txt); if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
-#define _CRT_SECURE_NO_WARNINGS
 #define WIN32_LEAN_AND_MEAN
 
 #include <windows.h>
diff --git a/plugins/CountryFlags/src/utils.cpp b/plugins/CountryFlags/src/utils.cpp
index 26bb000014..9c0d0c6596 100644
--- a/plugins/CountryFlags/src/utils.cpp
+++ b/plugins/CountryFlags/src/utils.cpp
@@ -17,7 +17,7 @@ along with this program (Flags-License.txt); if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
-#include "flags.h"
+#include "stdafx.h"
 
 /************************* Buffered Functions *********************/
 
@@ -36,7 +36,7 @@ static struct BufferedCallData *callList;
 static int nCallListCount;
 
 // always gets called in main message loop
-static void CALLBACK BufferedProcTimer(HWND hwnd,UINT msg,UINT_PTR idTimer,DWORD currentTick)
+static void CALLBACK BufferedProcTimer(HWND hwnd,UINT,UINT_PTR idTimer,DWORD currentTick)
 {
 	struct BufferedCallData *buf;
 	UINT uElapsed,uElapseNext=USER_TIMER_MAXIMUM;