summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKirill Volinsky <mataes2007@gmail.com>2015-04-08 05:07:18 +0000
committerKirill Volinsky <mataes2007@gmail.com>2015-04-08 05:07:18 +0000
commitce4b1a5b8f6ef72363f7aab778408e2cd317565e (patch)
treefd4665d11919f5c6e3497e89136d15c909f1ab5e
parentae1ec2faa3641b2cf43d2963738db22d2a008526 (diff)
compilation fix
git-svn-id: http://svn.miranda-ng.org/main/trunk@12669 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
-rw-r--r--protocols/SkypeWeb/src/skype_avatars.cpp4
-rw-r--r--protocols/SkypeWeb/src/skype_proto.h4
2 files changed, 3 insertions, 5 deletions
diff --git a/protocols/SkypeWeb/src/skype_avatars.cpp b/protocols/SkypeWeb/src/skype_avatars.cpp
index b6b486c2ab..a62d936abf 100644
--- a/protocols/SkypeWeb/src/skype_avatars.cpp
+++ b/protocols/SkypeWeb/src/skype_avatars.cpp
@@ -179,7 +179,7 @@ INT_PTR CSkypeProto::SvcSetMyAvatar(WPARAM wParam, LPARAM lParam)
if (read != length)
{
fclose(hFile);
- debugLogA("CToxProto::SetToxAvatar: failed to read avatar file");
+ debugLogA("CSkypeProto::SvcSetMyAvatar: failed to read avatar file");
return -1;
}
fclose(hFile);
@@ -195,8 +195,6 @@ INT_PTR CSkypeProto::SvcSetMyAvatar(WPARAM wParam, LPARAM lParam)
{
DeleteFile(avatarPath);
}
-
- //db_unset(NULL, m_szModuleName, TOX_SETTINGS_AVATAR_HASH);
}
return 0;
diff --git a/protocols/SkypeWeb/src/skype_proto.h b/protocols/SkypeWeb/src/skype_proto.h
index 7f06d05385..5c45aa1840 100644
--- a/protocols/SkypeWeb/src/skype_proto.h
+++ b/protocols/SkypeWeb/src/skype_proto.h
@@ -201,7 +201,7 @@ private:
int OnSendMessage(MCONTACT hContact, int flags, const char *message);
void OnMessageSent(const NETLIBHTTPREQUEST *response, void *arg);
- int OnPreCreateMessage(WPARAM, LPARAM lParam);
+ int __cdecl OnPreCreateMessage(WPARAM, LPARAM lParam);
void OnGetServerHistory(const NETLIBHTTPREQUEST *response);
@@ -212,7 +212,7 @@ private:
//polling
void ParsePollData(JSONNODE *data);
- void PollingThread(void*);
+ void __cdecl PollingThread(void*);
void ProcessEndpointPresenceRes(JSONNODE *node);
void ProcessUserPresenceRes(JSONNODE *node);
void ProcessNewMessageRes(JSONNODE *node);