From 4e2a8eb11a9a4286eb0bcb3386bab58e87ae4b69 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Sat, 28 Feb 2015 10:30:20 +0000
Subject: compilation fix

git-svn-id: http://svn.miranda-ng.org/main/trunk@12283 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 protocols/Tox/src/tox_contacts.cpp |  4 ++--
 protocols/Tox/src/tox_menus.cpp    |  4 ++--
 protocols/Tox/src/tox_profile.cpp  |  2 +-
 protocols/Tox/src/tox_proto.h      | 14 +++++++-------
 4 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'protocols')

diff --git a/protocols/Tox/src/tox_contacts.cpp b/protocols/Tox/src/tox_contacts.cpp
index fdcc378691..c972a2c07c 100644
--- a/protocols/Tox/src/tox_contacts.cpp
+++ b/protocols/Tox/src/tox_contacts.cpp
@@ -152,7 +152,7 @@ void CToxProto::LoadFriendList(void*)
 	}
 }
 
-int CToxProto::OnRequestAuth(MCONTACT hContact, LPARAM lParam)
+INT_PTR CToxProto::OnRequestAuth(WPARAM hContact, LPARAM lParam)
 {
 	if (!IsOnline())
 	{
@@ -182,7 +182,7 @@ int CToxProto::OnRequestAuth(MCONTACT hContact, LPARAM lParam)
 	return 0;
 }
 
-int CToxProto::OnGrantAuth(MCONTACT hContact, LPARAM)
+INT_PTR CToxProto::OnGrantAuth(WPARAM hContact, LPARAM)
 {
 	if (!IsOnline())
 	{
diff --git a/protocols/Tox/src/tox_menus.cpp b/protocols/Tox/src/tox_menus.cpp
index 60daad3090..22398b3a01 100644
--- a/protocols/Tox/src/tox_menus.cpp
+++ b/protocols/Tox/src/tox_menus.cpp
@@ -2,7 +2,7 @@
 
 HGENMENU CToxProto::ContactMenuItems[CMI_MAX];
 
-int CToxProto::OnPrebuildContactMenu(MCONTACT hContact, LPARAM)
+int CToxProto::OnPrebuildContactMenu(WPARAM hContact, LPARAM)
 {
 	if (!hContact)
 		return 0;
@@ -26,7 +26,7 @@ int CToxProto::OnPrebuildContactMenu(MCONTACT hContact, LPARAM)
 	return 0;
 }
 
-int CToxProto::PrebuildContactMenu(MCONTACT hContact, LPARAM lParam)
+int CToxProto::PrebuildContactMenu(WPARAM hContact, LPARAM lParam)
 {
 	for (int i = 0; i < SIZEOF(ContactMenuItems); i++)
 	{
diff --git a/protocols/Tox/src/tox_profile.cpp b/protocols/Tox/src/tox_profile.cpp
index 35014a4500..cdfbbe5fb8 100644
--- a/protocols/Tox/src/tox_profile.cpp
+++ b/protocols/Tox/src/tox_profile.cpp
@@ -137,7 +137,7 @@ void CToxProto::SaveToxProfile()
 	mir_free(data);
 }
 
-int CToxProto::OnCopyToxID(WPARAM, LPARAM)
+INT_PTR CToxProto::OnCopyToxID(WPARAM, LPARAM)
 {
 	ptrA address(getStringA(TOX_SETTINGS_ID));
 	size_t length = mir_strlen(address) + 1;
diff --git a/protocols/Tox/src/tox_proto.h b/protocols/Tox/src/tox_proto.h
index a68ec41c28..9a00b20c5a 100644
--- a/protocols/Tox/src/tox_proto.h
+++ b/protocols/Tox/src/tox_proto.h
@@ -87,7 +87,7 @@ private:
 	bool LoadToxProfile();
 	void SaveToxProfile();
 
-	int __cdecl OnCopyToxID(WPARAM, LPARAM);
+	INT_PTR __cdecl OnCopyToxID(WPARAM, LPARAM);
 
 	static INT_PTR CALLBACK ToxProfileImportProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
 	static INT_PTR CALLBACK ToxProfilePasswordProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
@@ -132,8 +132,8 @@ private:
 
 	// menus
 	static HGENMENU ContactMenuItems[CMI_MAX];
-	int OnPrebuildContactMenu(MCONTACT hContact, LPARAM);
-	static int PrebuildContactMenu(MCONTACT hContact, LPARAM lParam);
+	int OnPrebuildContactMenu(WPARAM hContact, LPARAM);
+	static int PrebuildContactMenu(WPARAM hContact, LPARAM lParam);
 
 	int OnInitStatusMenu();
 
@@ -166,8 +166,8 @@ private:
 
 	void __cdecl LoadFriendList(void*);
 
-	int __cdecl OnRequestAuth(MCONTACT hContact, LPARAM lParam);
-	int __cdecl OnGrantAuth(MCONTACT hContact, LPARAM);
+	INT_PTR __cdecl OnRequestAuth(WPARAM hContact, LPARAM lParam);
+	INT_PTR __cdecl OnGrantAuth(WPARAM hContact, LPARAM);
 
 	static void OnFriendRequest(Tox *tox, const uint8_t *pubKey, const uint8_t *message, const uint16_t messageSize, void *arg);
 	static void OnFriendNameChange(Tox *tox, const int friendNumber, const uint8_t *name, const uint16_t nameSize, void *arg);
@@ -252,8 +252,8 @@ private:
 
 	static bool IsFileExists(std::tstring path);
 
-	template<int(__cdecl CToxProto::*Service)(WPARAM, LPARAM)>
-	static INT_PTR GlobalService(WPARAM wParam, LPARAM lParam)
+	template<INT_PTR(__cdecl CToxProto::*Service)(WPARAM, LPARAM)>
+	static INT_PTR __cdecl GlobalService(WPARAM wParam, LPARAM lParam)
 	{
 		CToxProto *proto = CToxProto::GetContactAccount((MCONTACT)wParam);
 		return proto ? (proto->*Service)(wParam, lParam) : 0;
-- 
cgit v1.2.3