diff options
| author | Kirill Volinsky <mataes2007@gmail.com> | 2012-12-28 19:21:29 +0000 |
|---|---|---|
| committer | Kirill Volinsky <mataes2007@gmail.com> | 2012-12-28 19:21:29 +0000 |
| commit | 121f8a3e433af878f1168d28035ad4fd17b7aa0b (patch) | |
| tree | a4032ca24cc27063dec6baeb999209a3cc2ca891 | |
| parent | 953e026340f1300c9419625913fbc958a0e098ba (diff) | |
fixed compile error on vc2012
fixed crash on start
git-svn-id: http://svn.miranda-ng.org/main/trunk@2874 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
| -rw-r--r-- | protocols/Skype/src/skype.h | 3 | ||||
| -rw-r--r-- | protocols/Skype/src/skype_netlib.cpp | 4 | ||||
| -rw-r--r-- | protocols/Skype/src/skype_subclassing.cpp | 7 |
3 files changed, 5 insertions, 9 deletions
diff --git a/protocols/Skype/src/skype.h b/protocols/Skype/src/skype.h index ba1a8266b7..2816fd984f 100644 --- a/protocols/Skype/src/skype.h +++ b/protocols/Skype/src/skype.h @@ -3,8 +3,9 @@ #define MIRANDA_VER 0x0A00
#include <windows.h>
-#include <malloc.h>
#include <shlwapi.h>
+#include <ShellAPI.h>
+#include <malloc.h>
#include <tlhelp32.h>
#include <string>
diff --git a/protocols/Skype/src/skype_netlib.cpp b/protocols/Skype/src/skype_netlib.cpp index d86845fc45..1f6f5a8dc4 100644 --- a/protocols/Skype/src/skype_netlib.cpp +++ b/protocols/Skype/src/skype_netlib.cpp @@ -15,8 +15,8 @@ void CSkypeProto::InitNetLib() this->Log(
L"Setting protocol/module name to '%s/%s'",
- ::mir_a2u(this->m_szProtoName),
- ::mir_a2u(this->m_szModuleName));
+ _A2T(this->m_szProtoName),
+ _A2T(this->m_szModuleName));
}
void CSkypeProto::UninitNetLib()
diff --git a/protocols/Skype/src/skype_subclassing.cpp b/protocols/Skype/src/skype_subclassing.cpp index 32a8c95b2c..50b4e67f4f 100644 --- a/protocols/Skype/src/skype_subclassing.cpp +++ b/protocols/Skype/src/skype_subclassing.cpp @@ -1,11 +1,6 @@ -#include "skype_subclassing.h"
+#include "skype.h"
-#include <win2k.h>
-#include <ShellAPI.h>
-#include <shlwapi.h>
-#include <tlhelp32.h>
#include "base64/base64.h"
-#include "..\..\..\skypekit\key.h"
extern "C"
{
#include "aes\aes.h"
|