From b405eede7f078cf67e6b345c06bd074eceec9b75 Mon Sep 17 00:00:00 2001
From: Vadim Dashevskiy <watcherhd@gmail.com>
Date: Sun, 26 Jul 2015 10:53:09 +0000
Subject: OpenSSL: common project

git-svn-id: http://svn.miranda-ng.org/main/trunk@14715 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/OpenSSL/src/commonheaders.cpp |  2 -
 plugins/OpenSSL/src/commonheaders.h   | 71 -----------------------------------
 plugins/OpenSSL/src/main.cpp          |  6 +--
 plugins/OpenSSL/src/ssl_openssl.cpp   |  6 +--
 plugins/OpenSSL/src/stdafx.cxx        | 18 +++++++++
 plugins/OpenSSL/src/stdafx.h          | 71 +++++++++++++++++++++++++++++++++++
 6 files changed, 95 insertions(+), 79 deletions(-)
 delete mode 100644 plugins/OpenSSL/src/commonheaders.cpp
 delete mode 100644 plugins/OpenSSL/src/commonheaders.h
 create mode 100644 plugins/OpenSSL/src/stdafx.cxx
 create mode 100644 plugins/OpenSSL/src/stdafx.h

(limited to 'plugins/OpenSSL/src')

diff --git a/plugins/OpenSSL/src/commonheaders.cpp b/plugins/OpenSSL/src/commonheaders.cpp
deleted file mode 100644
index a07e22564e..0000000000
--- a/plugins/OpenSSL/src/commonheaders.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "commonheaders.h"
-
diff --git a/plugins/OpenSSL/src/commonheaders.h b/plugins/OpenSSL/src/commonheaders.h
deleted file mode 100644
index 99b3c76c9a..0000000000
--- a/plugins/OpenSSL/src/commonheaders.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
-
-Miranda NG: the free IM client for Microsoft* Windows*
-
-Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
-Copyright (c) 2000-12 Miranda IM project,
-all portions of this codebase are copyrighted to the people
-listed in contributors.txt.
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-*/
-
-#include <tchar.h>
-#include <winsock2.h>
-#include <shlobj.h>
-#include <commctrl.h>
-#include <vssym32.h>
-
-#include <stdio.h>
-#include <time.h>
-#include <stddef.h>
-#include <process.h>
-#include <io.h>
-#include <limits.h>
-#include <string.h>
-#include <locale.h>
-#include <direct.h>
-#include <malloc.h>
-
-#include <win2k.h>
-
-#include <m_system.h>
-#include <m_system_cpp.h>
-#include <m_core.h>
-#include <newpluginapi.h>
-#include <m_utils.h>
-#include <m_netlib.h>
-#include <m_langpack.h>
-#include <m_button.h>
-#include <m_protosvc.h>
-#include <m_protocols.h>
-#include <m_options.h>
-#include <m_skin.h>
-#include <m_contacts.h>
-#include <m_message.h>
-#include <m_userinfo.h>
-#include <m_findadd.h>
-#include <m_ignore.h>
-#include <m_icolib.h>
-#include <m_modernopt.h>
-#include <m_timezones.h>
-#include <m_string.h>
-
-#include "version.h"
-
-#include "m_ssl.h"
-#include "m_netlib.h"
-
-extern HINSTANCE hInst;
diff --git a/plugins/OpenSSL/src/main.cpp b/plugins/OpenSSL/src/main.cpp
index 38bb50b884..f4e4486cf9 100644
--- a/plugins/OpenSSL/src/main.cpp
+++ b/plugins/OpenSSL/src/main.cpp
@@ -18,7 +18,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#include "commonheaders.h"
+#include "stdafx.h"
 
 int LoadSslModule(void);
 void UnloadSslModule(void);
@@ -40,13 +40,13 @@ PLUGININFOEX pluginInfo = {
 	{ 0xb649702c, 0x13de, 0x408a, { 0xb6, 0xc2, 0xfb, 0x8f, 0xed, 0x2a, 0x2c, 0x90 } }
 };
 
-BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
+BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD, LPVOID)
 {
 	hInst = hinstDLL;
 	return TRUE;
 }
 
-extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion)
+extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD)
 {
 	return &pluginInfo;
 }
diff --git a/plugins/OpenSSL/src/ssl_openssl.cpp b/plugins/OpenSSL/src/ssl_openssl.cpp
index 6a50102bd6..02912fc396 100644
--- a/plugins/OpenSSL/src/ssl_openssl.cpp
+++ b/plugins/OpenSSL/src/ssl_openssl.cpp
@@ -22,7 +22,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
-#include "commonheaders.h"
+#include "stdafx.h"
 #include <m_popup.h>
 
 #define SECURITY_WIN32
@@ -248,7 +248,7 @@ const char* SSL_GetCipherName(SslHandle *ssl)
 	return g_OpenSSL.SSL_CIPHER_get_name(g_OpenSSL.SSL_get_current_cipher(ssl->session));
 }
 
-static void ReportSslError(SECURITY_STATUS scRet, int line, bool showPopup = false)
+static void ReportSslError(SECURITY_STATUS scRet, int line, bool = false)
 {
 	TCHAR szMsgBuf[256];
 	switch (scRet)
@@ -301,7 +301,7 @@ BOOL NetlibSslPending(SslHandle *ssl)
 	return ssl && ssl->session && (g_OpenSSL.SSL_pending(ssl->session) > 0);
 }
 
-static bool ClientConnect(SslHandle *ssl, const char *host)
+static bool ClientConnect(SslHandle *ssl, const char*)
 {
 	SSL_METHOD * meth;
 
diff --git a/plugins/OpenSSL/src/stdafx.cxx b/plugins/OpenSSL/src/stdafx.cxx
new file mode 100644
index 0000000000..6fb37564b7
--- /dev/null
+++ b/plugins/OpenSSL/src/stdafx.cxx
@@ -0,0 +1,18 @@
+/*
+Copyright (C) 2012-15 Miranda NG project (http://miranda-ng.org)
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation version 2
+of the License.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "stdafx.h"
\ No newline at end of file
diff --git a/plugins/OpenSSL/src/stdafx.h b/plugins/OpenSSL/src/stdafx.h
new file mode 100644
index 0000000000..99b3c76c9a
--- /dev/null
+++ b/plugins/OpenSSL/src/stdafx.h
@@ -0,0 +1,71 @@
+/*
+
+Miranda NG: the free IM client for Microsoft* Windows*
+
+Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
+all portions of this codebase are copyrighted to the people
+listed in contributors.txt.
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
+#include <tchar.h>
+#include <winsock2.h>
+#include <shlobj.h>
+#include <commctrl.h>
+#include <vssym32.h>
+
+#include <stdio.h>
+#include <time.h>
+#include <stddef.h>
+#include <process.h>
+#include <io.h>
+#include <limits.h>
+#include <string.h>
+#include <locale.h>
+#include <direct.h>
+#include <malloc.h>
+
+#include <win2k.h>
+
+#include <m_system.h>
+#include <m_system_cpp.h>
+#include <m_core.h>
+#include <newpluginapi.h>
+#include <m_utils.h>
+#include <m_netlib.h>
+#include <m_langpack.h>
+#include <m_button.h>
+#include <m_protosvc.h>
+#include <m_protocols.h>
+#include <m_options.h>
+#include <m_skin.h>
+#include <m_contacts.h>
+#include <m_message.h>
+#include <m_userinfo.h>
+#include <m_findadd.h>
+#include <m_ignore.h>
+#include <m_icolib.h>
+#include <m_modernopt.h>
+#include <m_timezones.h>
+#include <m_string.h>
+
+#include "version.h"
+
+#include "m_ssl.h"
+#include "m_netlib.h"
+
+extern HINSTANCE hInst;
-- 
cgit v1.2.3