summaryrefslogtreecommitdiff
path: root/plugins/OpenSSL/src
diff options
context:
space:
mode:
authorVadim Dashevskiy <watcherhd@gmail.com>2015-07-26 10:53:09 +0000
committerVadim Dashevskiy <watcherhd@gmail.com>2015-07-26 10:53:09 +0000
commitb405eede7f078cf67e6b345c06bd074eceec9b75 (patch)
tree38d200ff5e06e00201fd9b38ac6f09ccded10950 /plugins/OpenSSL/src
parent9afe3b2e83e846d56c8b9c808681d0f06bbc1c40 (diff)
OpenSSL: common project
git-svn-id: http://svn.miranda-ng.org/main/trunk@14715 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/OpenSSL/src')
-rw-r--r--plugins/OpenSSL/src/commonheaders.cpp2
-rw-r--r--plugins/OpenSSL/src/main.cpp6
-rw-r--r--plugins/OpenSSL/src/ssl_openssl.cpp6
-rw-r--r--plugins/OpenSSL/src/stdafx.cxx18
-rw-r--r--plugins/OpenSSL/src/stdafx.h (renamed from plugins/OpenSSL/src/commonheaders.h)0
5 files changed, 24 insertions, 8 deletions
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/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/commonheaders.h b/plugins/OpenSSL/src/stdafx.h
index 99b3c76c9a..99b3c76c9a 100644
--- a/plugins/OpenSSL/src/commonheaders.h
+++ b/plugins/OpenSSL/src/stdafx.h