From c12702e77fa2e539f48301be4f04861c503dea08 Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Sat, 19 Oct 2013 21:38:38 +0000 Subject: x64 compilation fix git-svn-id: http://svn.miranda-ng.org/main/trunk@6545 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/WinterSpeak/src/ProtocolInformation.cpp | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) (limited to 'plugins/WinterSpeak/src/ProtocolInformation.cpp') diff --git a/plugins/WinterSpeak/src/ProtocolInformation.cpp b/plugins/WinterSpeak/src/ProtocolInformation.cpp index d04f485a9b..d601fa6757 100644 --- a/plugins/WinterSpeak/src/ProtocolInformation.cpp +++ b/plugins/WinterSpeak/src/ProtocolInformation.cpp @@ -27,6 +27,15 @@ ProtocolInformation::~ProtocolInformation() } } +void CALLBACK ProtocolInformation::TimerProc(HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTime) +{ + ProtocolTimeout pt = m_instance->m_protocol_timeout.front(); + + KillTimer(NULL, pt.second); + + m_instance->m_protocol_timeout.pop_front(); +} + //------------------------------------------------------------------------------ void ProtocolInformation::disable(const char *protocol) { @@ -37,7 +46,7 @@ void ProtocolInformation::disable(const char *protocol) const unsigned int TIMEOUT = 10000; - unsigned int t = SetTimer(NULL, NULL, TIMEOUT, ProtocolInformation::timeout); + unsigned int t = SetTimer(NULL, (UINT_PTR)this, TIMEOUT, (TIMERPROC)TimerProc); m_protocol_timeout.push_back(std::make_pair(protocol, t)); } @@ -63,16 +72,4 @@ bool ProtocolInformation::isDisabled(const char *protocol) const return false; } -//------------------------------------------------------------------------------ -// private: -//------------------------------------------------------------------------------ -void CALLBACK ProtocolInformation::timeout(HWND hwnd, UINT uMsg, UINT idEvent, DWORD dwTime) -{ - ProtocolTimeout pt = m_instance->m_protocol_timeout.front(); - - KillTimer(NULL, pt.second); - - m_instance->m_protocol_timeout.pop_front(); -} - //============================================================================== -- cgit v1.2.3