summaryrefslogtreecommitdiff
path: root/protocols/Tox/src/tox_proto.h
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2015-02-28 10:30:20 +0000
committerGeorge Hazan <george.hazan@gmail.com>2015-02-28 10:30:20 +0000
commit4e2a8eb11a9a4286eb0bcb3386bab58e87ae4b69 (patch)
treea59c78f3bc9efed548e772fdd8e03590c836bd1a /protocols/Tox/src/tox_proto.h
parent4b123a75ad7a9a39be23947b7a2e11ff44b1e975 (diff)
compilation fix
git-svn-id: http://svn.miranda-ng.org/main/trunk@12283 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/Tox/src/tox_proto.h')
-rw-r--r--protocols/Tox/src/tox_proto.h14
1 files changed, 7 insertions, 7 deletions
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;