diff options
| author | George Hazan <george.hazan@gmail.com> | 2015-08-27 15:15:33 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2015-08-27 15:15:33 +0000 |
| commit | d6eee2018898f2442883a0aa77ad095b75572cfb (patch) | |
| tree | 8fbfe32690b9b32e5d47b1958a02f6f6a5fbf000 /plugins/MirandaG15/src | |
| parent | 2d37d969153b5fad810984182f747755c1cbc616 (diff) | |
fix for 64-bit issues & warnings
git-svn-id: http://svn.miranda-ng.org/main/trunk@15043 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/MirandaG15/src')
| -rw-r--r-- | plugins/MirandaG15/src/CAppletManager.cpp | 6 | ||||
| -rw-r--r-- | plugins/MirandaG15/src/LCDFramework/ConStream.cpp | bin | 3624 -> 3625 bytes |
2 files changed, 3 insertions, 3 deletions
diff --git a/plugins/MirandaG15/src/CAppletManager.cpp b/plugins/MirandaG15/src/CAppletManager.cpp index d0935dd0f6..2ec2cb4f48 100644 --- a/plugins/MirandaG15/src/CAppletManager.cpp +++ b/plugins/MirandaG15/src/CAppletManager.cpp @@ -1546,9 +1546,9 @@ int CAppletManager::HookProtoAck(WPARAM, LPARAM lParam) if (pAck->type == ACKTYPE_MESSAGE) { list<SMessageJob*>::iterator iter = CAppletManager::GetInstance()->m_MessageJobs.begin(); while (iter != CAppletManager::GetInstance()->m_MessageJobs.end()) { - if ((*iter)->hEvent == (MEVENT)pAck->hProcess && (*iter)->hContact == pAck->hContact) { + if ((*iter)->hEvent == (UINT_PTR)pAck->hProcess && (*iter)->hContact == pAck->hContact) { Event.eType = EVENT_MESSAGE_ACK; - Event.hValue = (MEVENT)pAck->hProcess; + Event.hValue = (UINT_PTR)pAck->hProcess; Event.hContact = pAck->hContact; Event.iValue = pAck->result; if (pAck->lParam != 0) @@ -1570,7 +1570,7 @@ int CAppletManager::HookProtoAck(WPARAM, LPARAM lParam) } // protocol status changes else if (pAck->type == ACKTYPE_STATUS && pAck->result == ACKRESULT_SUCCESS) { - int iOldStatus = (int)pAck->hProcess; + int iOldStatus = (INT_PTR)pAck->hProcess; int iNewStatus = pAck->lParam; tstring strProto = toTstring(pAck->szModule); diff --git a/plugins/MirandaG15/src/LCDFramework/ConStream.cpp b/plugins/MirandaG15/src/LCDFramework/ConStream.cpp Binary files differindex 98b3f5c921..f3c4048c01 100644 --- a/plugins/MirandaG15/src/LCDFramework/ConStream.cpp +++ b/plugins/MirandaG15/src/LCDFramework/ConStream.cpp |