diff options
| author | Rozhuk Ivan <rozhuk.im@gmail.com> | 2014-11-30 00:53:10 +0000 |
|---|---|---|
| committer | Rozhuk Ivan <rozhuk.im@gmail.com> | 2014-11-30 00:53:10 +0000 |
| commit | ce2af47d41cc790df1b18d9e80295a38747de19f (patch) | |
| tree | b9e75709ec7e75dada1c77a3ea70f1304091cae9 /protocols/EmLanProto/src | |
| parent | a5574d24bc8c0e94c8880c75f0fd27d08d30b98b (diff) | |
code cleanup, x64 fix
git-svn-id: http://svn.miranda-ng.org/main/trunk@11163 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/EmLanProto/src')
| -rw-r--r-- | protocols/EmLanProto/src/mlan.cpp | 6 | ||||
| -rw-r--r-- | protocols/EmLanProto/src/mlan.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/protocols/EmLanProto/src/mlan.cpp b/protocols/EmLanProto/src/mlan.cpp index 669f873090..945a6a16b7 100644 --- a/protocols/EmLanProto/src/mlan.cpp +++ b/protocols/EmLanProto/src/mlan.cpp @@ -449,10 +449,10 @@ void CMLan::RecvMessageUrl(CCSDATA* ccs) db_event_add(ccs->hContact, &dbei); } -int CMLan::AddToContactList(u_int flags, EMPSEARCHRESULT* psr) +INT_PTR CMLan::AddToContactList(u_int flags, EMPSEARCHRESULT* psr) { if (psr->hdr.cbSize!=sizeof(EMPSEARCHRESULT)) - return (int)(HANDLE)NULL; + return 0; in_addr addr; addr.S_un.S_addr = psr->ipaddr; @@ -465,7 +465,7 @@ int CMLan::AddToContactList(u_int flags, EMPSEARCHRESULT* psr) db_set_w(contact,PROTONAME,"RemoteVersion", psr->ver ); } - return (int)contact; + return (INT_PTR)contact; } int CMLan::SendMessageUrl(CCSDATA* ccs, bool isUrl) diff --git a/protocols/EmLanProto/src/mlan.h b/protocols/EmLanProto/src/mlan.h index 71d4182dfa..d3f518b04d 100644 --- a/protocols/EmLanProto/src/mlan.h +++ b/protocols/EmLanProto/src/mlan.h @@ -58,7 +58,7 @@ public: int RecvAwayMsg(CCSDATA* ccs);
int SetAwayMsg(u_int status, char* msg);
- int AddToContactList(u_int flags, EMPSEARCHRESULT* psr);
+ INT_PTR AddToContactList(u_int flags, EMPSEARCHRESULT* psr);
int Search(const char* name);
void LoadSettings();
void SaveSettings();
|