From 23291e3639741d6539f39695036bd140429ddccc Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Sun, 21 Apr 2013 07:39:00 +0000 Subject: x64 compilation fix git-svn-id: http://svn.miranda-ng.org/main/trunk@4497 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/New_GPG/src/init.cpp | 6 +++--- plugins/New_GPG/src/messages.cpp | 4 ++-- plugins/New_GPG/src/utilities.cpp | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/plugins/New_GPG/src/init.cpp b/plugins/New_GPG/src/init.cpp index 0729b277f4..b0a2232cce 100755 --- a/plugins/New_GPG/src/init.cpp +++ b/plugins/New_GPG/src/init.cpp @@ -105,8 +105,8 @@ static int OnModulesLoaded(WPARAM wParam,LPARAM lParam) { int GpgOptInit(WPARAM wParam,LPARAM lParam); int OnPreBuildContactMenu(WPARAM w, LPARAM l); - int RecvMsgSvc(WPARAM w, LPARAM l); - int SendMsgSvc(WPARAM w, LPARAM l); + INT_PTR RecvMsgSvc(WPARAM w, LPARAM l); + INT_PTR SendMsgSvc(WPARAM w, LPARAM l); int HookSendMsg(WPARAM w, LPARAM l); // int TestHook(WPARAM w, LPARAM l); int GetJabberInterface(WPARAM w, LPARAM l); @@ -115,7 +115,7 @@ static int OnModulesLoaded(WPARAM wParam,LPARAM lParam) int onExtraImageListRebuilding(WPARAM, LPARAM); int onExtraImageApplying(WPARAM wParam, LPARAM); int onProtoAck(WPARAM, LPARAM); - int onSendFile(WPARAM, LPARAM); + INT_PTR onSendFile(WPARAM, LPARAM); void InitIconLib(); void InitCheck(); diff --git a/plugins/New_GPG/src/messages.cpp b/plugins/New_GPG/src/messages.cpp index dc870d9f37..3eefe84b91 100755 --- a/plugins/New_GPG/src/messages.cpp +++ b/plugins/New_GPG/src/messages.cpp @@ -356,7 +356,7 @@ void RecvMsgSvc_func(HANDLE hContact, std::wstring str, char *msg, DWORD flags, return; } -int RecvMsgSvc(WPARAM w, LPARAM l) +INT_PTR RecvMsgSvc(WPARAM w, LPARAM l) { CCSDATA *ccs = (CCSDATA*)l; if (!ccs) @@ -800,7 +800,7 @@ void SendMsgSvc_func(HANDLE hContact, char *msg, DWORD flags) return; } -int SendMsgSvc(WPARAM w, LPARAM l) +INT_PTR SendMsgSvc(WPARAM w, LPARAM l) { CCSDATA *ccs = (CCSDATA*)l; if (!ccs) diff --git a/plugins/New_GPG/src/utilities.cpp b/plugins/New_GPG/src/utilities.cpp index 7d3e92d915..ce78023bdf 100755 --- a/plugins/New_GPG/src/utilities.cpp +++ b/plugins/New_GPG/src/utilities.cpp @@ -534,7 +534,7 @@ std::wstring encrypt_file(HANDLE hContact, TCHAR *filename) } //from secureim partially -int onSendFile(WPARAM w, LPARAM l) +INT_PTR onSendFile(WPARAM w, LPARAM l) { if(!bFileTransfers) return CallService(MS_PROTO_CHAINSEND, w, l); -- cgit v1.2.3