From 43fc7b251649ff90ff72994c097f8b1f7b8f0b48 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Tue, 11 Aug 2015 09:54:09 +0000
Subject: fix for strange SSL API structure name

git-svn-id: http://svn.miranda-ng.org/main/trunk@14905 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 protocols/Gadu-Gadu/src/gg.cpp              |  4 ++--
 protocols/Gadu-Gadu/src/gg.h                |  2 ++
 protocols/Gadu-Gadu/src/libgadu/events.cpp  |  4 +++-
 protocols/Gadu-Gadu/src/libgadu/libgadu.cpp | 10 ++++++----
 4 files changed, 13 insertions(+), 7 deletions(-)

(limited to 'protocols')

diff --git a/protocols/Gadu-Gadu/src/gg.cpp b/protocols/Gadu-Gadu/src/gg.cpp
index cf9f0aad10..af3bd97329 100644
--- a/protocols/Gadu-Gadu/src/gg.cpp
+++ b/protocols/Gadu-Gadu/src/gg.cpp
@@ -41,7 +41,7 @@ PLUGININFOEX pluginInfo = {
 // Other variables
 HINSTANCE hInstance;
 
-SSL_API si;
+SSL_API sslApi;
 CLIST_INTERFACE *pcli;
 int hLangpack;
 LIST<GGPROTO> g_Instances(1, PtrKeySortT);
@@ -181,7 +181,7 @@ void GGPROTO::cleanuplastplugin(DWORD version)
 static int gg_modulesloaded(WPARAM wParam, LPARAM lParam)
 {
    // Get SSL API
-   mir_getSI(&si);
+   mir_getSI(&sslApi);
 
    // File Association Manager support
    gg_links_init();
diff --git a/protocols/Gadu-Gadu/src/gg.h b/protocols/Gadu-Gadu/src/gg.h
index b0c567ada9..9fb6394bf0 100644
--- a/protocols/Gadu-Gadu/src/gg.h
+++ b/protocols/Gadu-Gadu/src/gg.h
@@ -338,4 +338,6 @@ const char *ggdebug_eventtype(gg_event *e);
 
 #include "gg_proto.h"
 
+extern SSL_API sslApi;
+
 #endif
diff --git a/protocols/Gadu-Gadu/src/libgadu/events.cpp b/protocols/Gadu-Gadu/src/libgadu/events.cpp
index 2a24b77e3c..44bfa73cab 100644
--- a/protocols/Gadu-Gadu/src/libgadu/events.cpp
+++ b/protocols/Gadu-Gadu/src/libgadu/events.cpp
@@ -63,6 +63,8 @@
 #endif
 #endif
 
+extern SSL_API sslApi;
+
 /**
  * Zwalnia pamięć zajmowaną przez informację o zdarzeniu.
  *
@@ -2433,7 +2435,7 @@ struct gg_event *gg_watch_fd(struct gg_session *sess)
 		{
 			gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd() GG_STATE_TLS_NEGOTIATION\n");
 
-			sess->ssl = si.connect(sess->fd, 0, 0);
+			sess->ssl = sslApi.connect(sess->fd, 0, 0);
 
 			if (sess->ssl == NULL) {
 				gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd() TLS negotiation failed\n");
diff --git a/protocols/Gadu-Gadu/src/libgadu/libgadu.cpp b/protocols/Gadu-Gadu/src/libgadu/libgadu.cpp
index a827b261e1..197c6093d3 100644
--- a/protocols/Gadu-Gadu/src/libgadu/libgadu.cpp
+++ b/protocols/Gadu-Gadu/src/libgadu/libgadu.cpp
@@ -69,6 +69,8 @@
 #  include <openssl/rand.h>
 #endif
 
+extern SSL_API sslApi;
+
 /**
  * Poziom rejestracji informacji odpluskwiających. Zmienna jest maską bitową
  * składającą się ze stałych \c GG_DEBUG_...
@@ -323,7 +325,7 @@ int gg_read(struct gg_session *sess, char *buf, int length)
 {
 #ifdef GG_CONFIG_MIRANDA
 	if (sess->ssl != NULL)
-		return si.read(sess->ssl, buf, length, 0);
+		return sslApi.read(sess->ssl, buf, length, 0);
 #elif GG_CONFIG_HAVE_OPENSSL
 	if (sess->ssl != NULL) {
 		for (;;) {
@@ -373,7 +375,7 @@ static int gg_write_common(struct gg_session *sess, const char *buf, int length)
 {
 #ifdef GG_CONFIG_MIRANDA
 	if (sess->ssl != NULL)
-		return si.write(sess->ssl, buf, length);
+		return sslApi.write(sess->ssl, buf, length);
 #elif GG_CONFIG_HAVE_OPENSSL
 	if (sess->ssl != NULL) {
 		for (;;) {
@@ -1064,7 +1066,7 @@ void gg_logoff(struct gg_session *sess)
 
 #ifdef GG_CONFIG_MIRANDA
 	if (sess->ssl != NULL)
-		si.shutdown(sess->ssl);
+		sslApi.shutdown(sess->ssl);
 #elif GG_CONFIG_HAVE_OPENSSL
 	if (sess->ssl != NULL)
 		SSL_shutdown(sess->ssl);
@@ -1110,7 +1112,7 @@ void gg_free_session(struct gg_session *sess)
 
 #ifdef GG_CONFIG_MIRANDA
 	if (sess->ssl != NULL)
-		si.sfree(sess->ssl);
+		sslApi.sfree(sess->ssl);
 #elif GG_CONFIG_HAVE_OPENSSL
 	if (sess->ssl != NULL)
 		SSL_free(sess->ssl);
-- 
cgit v1.2.3