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 /protocols/Sametime/src/sametime_session.cpp | |
| 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 'protocols/Sametime/src/sametime_session.cpp')
| -rw-r--r-- | protocols/Sametime/src/sametime_session.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/protocols/Sametime/src/sametime_session.cpp b/protocols/Sametime/src/sametime_session.cpp index 74fede1541..abd9a0b508 100644 --- a/protocols/Sametime/src/sametime_session.cpp +++ b/protocols/Sametime/src/sametime_session.cpp @@ -106,9 +106,9 @@ void __cdecl SessionStateChange(mwSession* session, mwSessionState state, gpoint break;
case mwSession_STOPPING:
- if ((int)info) {// & ERR_FAILURE) {
- proto->showPopup((int)info);
- }
+ if ((INT_PTR)info)
+ proto->showPopup((INT_PTR)info);
+
proto->SessionStopping();
break;
@@ -475,8 +475,8 @@ WORD CSametimeProto::GetClientVersion() if (!session) return 0;
WORD retval = 0;
- retval = (int)mwSession_getProperty(session, mwSession_CLIENT_VER_MAJOR) << 8;
- retval |= (int)mwSession_getProperty(session, mwSession_CLIENT_VER_MINOR);
+ retval = (UINT_PTR)mwSession_getProperty(session, mwSession_CLIENT_VER_MAJOR) << 8;
+ retval |= (UINT_PTR)mwSession_getProperty(session, mwSession_CLIENT_VER_MINOR);
return retval;
}
@@ -485,8 +485,8 @@ WORD CSametimeProto::GetServerVersion() if (!session) return 0;
WORD retval = 0;
- retval = (int)mwSession_getProperty(session, mwSession_SERVER_VER_MAJOR) << 8;
- retval |= (int)mwSession_getProperty(session, mwSession_SERVER_VER_MINOR);
+ retval = (UINT_PTR)mwSession_getProperty(session, mwSession_SERVER_VER_MAJOR) << 8;
+ retval |= (UINT_PTR)mwSession_getProperty(session, mwSession_SERVER_VER_MINOR);
return retval;
}
|