From c797ebe33b5e5ad929392be428090708df42321b Mon Sep 17 00:00:00 2001
From: Alexander Lantsev <aunsane@gmail.com>
Date: Wed, 19 Jun 2013 21:21:10 +0000
Subject: Skype: x64 compilation fix

git-svn-id: http://svn.miranda-ng.org/main/trunk@5051 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 protocols/Skype/res/Resource.rc         | 4 ++--
 protocols/Skype/src/skype_bookmarks.cpp | 4 ++--
 protocols/Skype/src/skype_menus.cpp     | 6 +++---
 protocols/Skype/src/skype_proto.h       | 8 ++++----
 4 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'protocols')

diff --git a/protocols/Skype/res/Resource.rc b/protocols/Skype/res/Resource.rc
index 0a9c53fd22..09b0289af6 100644
--- a/protocols/Skype/res/Resource.rc
+++ b/protocols/Skype/res/Resource.rc
@@ -52,7 +52,7 @@ BEGIN
     PUSHBUTTON      "Add",IDC_ADDSCR,132,209,49,14
     LTEXT           "Topic:",IDC_STATIC,188,4,180,8
     EDITTEXT        IDC_CHAT_TOPIC,188,14,180,14,ES_AUTOHSCROLL
-    LTEXT           "Guidline:",IDC_STATIC,188,31,180,8
+    LTEXT           "Guideline:",IDC_STATIC,188,31,180,8
     EDITTEXT        IDC_CHAT_GUIDLINE,188,41,180,14,ES_AUTOHSCROLL
     CONTROL         "Enable joining",IDC_CHAT_JOINING,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,188,58,180,10
     LTEXT           "Users joining as:",IDC_STATIC,188,73,79,8
@@ -76,7 +76,7 @@ BEGIN
     PUSHBUTTON      "&Cancel",IDCANCEL,191,296,45,14
     LTEXT           "Topic:",IDC_STATIC,5,13,74,8
     EDITTEXT        IDC_CHAT_TOPIC,5,23,231,14,ES_AUTOHSCROLL
-    LTEXT           "Guidline:",IDC_STATIC,5,44,73,8
+    LTEXT           "Guideline:",IDC_STATIC,5,44,73,8
     EDITTEXT        IDC_CHAT_GUIDLINE,5,54,231,14,ES_AUTOHSCROLL
     LTEXT           "Password:",IDC_STATIC,16,131,62,8
     EDITTEXT        IDC_CHAT_GUIDLINE2,84,128,152,14,ES_AUTOHSCROLL
diff --git a/protocols/Skype/src/skype_bookmarks.cpp b/protocols/Skype/src/skype_bookmarks.cpp
index e95b9c7e84..29f3cc89d4 100644
--- a/protocols/Skype/src/skype_bookmarks.cpp
+++ b/protocols/Skype/src/skype_bookmarks.cpp
@@ -1,7 +1,7 @@
 #include "skype.h"
 #include "skype_chat.h"
 
-INT_PTR CSkypeProto::SetBookmarkCommand(WPARAM wParam, LPARAM)
+int CSkypeProto::SetBookmarkCommand(WPARAM wParam, LPARAM)
 {
 	HANDLE hContact = (HANDLE)wParam;
 	if (this->IsOnline() && this->IsChatRoom(hContact))
@@ -123,7 +123,7 @@ INT_PTR CALLBACK CSkypeProto::SkypeBookmarksProc(HWND hwndDlg, UINT msg, WPARAM
 
 				LVITEM lvi = {0};
 				lvi.mask = LVIF_GROUPID | LVIF_TEXT | LVIF_IMAGE | LVIF_PARAM;
-				lvi.iItem = i;
+				lvi.iItem = (int)i;
 				lvi.iGroupId = 1;
 				lvi.iImage = 0;
 				lvi.lParam = (LPARAM)conversation.fetch();
diff --git a/protocols/Skype/src/skype_menus.cpp b/protocols/Skype/src/skype_menus.cpp
index 2b2aca93d1..ee227134a1 100644
--- a/protocols/Skype/src/skype_menus.cpp
+++ b/protocols/Skype/src/skype_menus.cpp
@@ -1,7 +1,7 @@
 #include "skype.h"
 
 HANDLE CSkypeProto::hChooserMenu;
-std::map<int, HANDLE> CSkypeProto::contactMenuItems;
+std::map<size_t, HANDLE> CSkypeProto::contactMenuItems;
 
 INT_PTR CSkypeProto::MenuChooseService(WPARAM wParam, LPARAM lParam)
 {
@@ -150,7 +150,7 @@ int CSkypeProto::RevokeAuth(WPARAM wParam, LPARAM lParam)
 	return 0;
 }
 
-INT_PTR CSkypeProto::IgnoreCommand(WPARAM wParam, LPARAM)
+int CSkypeProto::IgnoreCommand(WPARAM wParam, LPARAM)
 {
 	CContact::Ref contact;
 	HANDLE hContact = (HANDLE)wParam;
@@ -168,7 +168,7 @@ INT_PTR CSkypeProto::IgnoreCommand(WPARAM wParam, LPARAM)
 	return 0;
 }
 
-INT_PTR CSkypeProto::BlockCommand(WPARAM wParam, LPARAM)
+int CSkypeProto::BlockCommand(WPARAM wParam, LPARAM)
 {
 	CContact::Ref contact;
 	HANDLE hContact = (HANDLE)wParam;
diff --git a/protocols/Skype/src/skype_proto.h b/protocols/Skype/src/skype_proto.h
index f60d88faa9..24df7c7e40 100644
--- a/protocols/Skype/src/skype_proto.h
+++ b/protocols/Skype/src/skype_proto.h
@@ -432,7 +432,7 @@ protected:
 	// menus
 	HGENMENU m_hMenuRoot;
 	static HANDLE hChooserMenu;
-	static std::map<int, HANDLE> contactMenuItems;
+	static std::map<size_t, HANDLE> contactMenuItems;
 
 	virtual	int __cdecl RequestAuth(WPARAM, LPARAM);
 	virtual	int __cdecl GrantAuth(WPARAM, LPARAM);
@@ -442,12 +442,12 @@ protected:
 
 	static INT_PTR MenuChooseService(WPARAM wParam, LPARAM lParam);
 
-	INT_PTR __cdecl IgnoreCommand(WPARAM, LPARAM);
-	INT_PTR __cdecl BlockCommand(WPARAM, LPARAM);
+	int __cdecl IgnoreCommand(WPARAM, LPARAM);
+	int __cdecl BlockCommand(WPARAM, LPARAM);
 
 	INT_PTR __cdecl InviteCommand(WPARAM, LPARAM);
 
-	INT_PTR __cdecl SetBookmarkCommand(WPARAM, LPARAM);
+	int __cdecl SetBookmarkCommand(WPARAM, LPARAM);
 	INT_PTR __cdecl ShowBookmarksCommand(WPARAM, LPARAM);
 
 	static int PrebuildContactMenu(WPARAM wParam, LPARAM lParam);
-- 
cgit v1.2.3