From 8a74e7495ce5ad39de4f5c25121a84d35df90c36 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Sun, 20 May 2018 15:08:48 +0300
Subject: CMPlugin to receive a reference to PLUGININFOEX

---
 src/core/stdssl/src/main.cpp | 10 +++++++---
 src/core/stdssl/src/stdafx.h |  4 +---
 2 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'src/core/stdssl')

diff --git a/src/core/stdssl/src/main.cpp b/src/core/stdssl/src/main.cpp
index 5fab770f9f..18fde05196 100644
--- a/src/core/stdssl/src/main.cpp
+++ b/src/core/stdssl/src/main.cpp
@@ -27,7 +27,7 @@ void UnloadSslModule(void);
 CMPlugin g_plugin;
 int &hLangpack(g_plugin.m_hLang);
 
-PLUGININFOEX pluginInfo = {
+PLUGININFOEX pluginInfoEx = {
 	sizeof(PLUGININFOEX),
 	__PLUGIN_NAME,
 	MIRANDA_VERSION_DWORD,
@@ -40,16 +40,20 @@ PLUGININFOEX pluginInfo = {
 	{ 0x312C4F84, 0x75BE, 0x4404, {0xBC, 0xB1, 0xC1, 0x03, 0xDB, 0xE5, 0xA3, 0xB8 }}
 };
 
+CMPlugin::CMPlugin() :
+	PLUGIN<CMPlugin>(nullptr, pluginInfoEx)
+{}
+
 extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD)
 {
-	return &pluginInfo;
+	return &pluginInfoEx;
 }
 
 extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = { MIID_SSL, MIID_LAST };
 
 extern "C" int __declspec(dllexport) Load(void)
 {
-	mir_getLP(&pluginInfo);
+	mir_getLP(&pluginInfoEx);
 
 	return LoadSslModule();
 }
diff --git a/src/core/stdssl/src/stdafx.h b/src/core/stdssl/src/stdafx.h
index 6221d6c3b4..8f875605f0 100644
--- a/src/core/stdssl/src/stdafx.h
+++ b/src/core/stdssl/src/stdafx.h
@@ -42,7 +42,5 @@ typedef struct SslHandle *HSSL;
 
 struct CMPlugin : public PLUGIN<CMPlugin>
 {
-	CMPlugin() :
-		PLUGIN<CMPlugin>(nullptr)
-	{}
+	CMPlugin();
 };
-- 
cgit v1.2.3