From: Steve Brokenshire <sbrokenshire@xestia.co.uk>
Date: Tue, 24 May 2016 20:27:45 +0000 (+0100)
Subject: Moved common/win32ssl.h include into the __WIN32__ if section in frmNewAccount.cpp
X-Git-Tag: release-0.13~9
X-Git-Url: http://Server1/repobrowser/?p=xestiaab%2F.git;a=commitdiff_plain;h=0b0653fe89542994aa91b0cef674a123ba66bedf

Moved common/win32ssl.h include into the __WIN32__ if section in frmNewAccount.cpp
---

diff --git a/source/frmNewAccount.cpp b/source/frmNewAccount.cpp
index 8768196..36a1f71 100644
--- a/source/frmNewAccount.cpp
+++ b/source/frmNewAccount.cpp
@@ -24,12 +24,12 @@
 
 #if defined(__WIN32__)
 #include <cryptuiapi.h>
+#include "common/win32ssl.h"
 #endif
 
 #include "carddav/carddav.h"
 #include "common/dirs.h"
 #include "common/svrblist.h"
-#include "common/win32ssl.h"
 #include "frmInvalidSSLCertificate.h"
 
 frmNewAccount::frmNewAccount( wxWindow* parent )
@@ -321,8 +321,12 @@ void frmNewAccount::ProcessNext( wxCommandEvent& event )
 		std::thread ConnTest(&CardDAV::Connect, &CardDAVConn);
         
 		ConnTest.join();
-        
+
+#if defined(__WIN32__)
 		if (ServerResult == FALSE && ModifiedCertificateData == FALSE){
+#else
+		if (ServerResult == FALSE){
+#endif
             
 			lblServerConnResult->SetLabel(_("Failed"));
 			lblConnectionResultText->SetLabel(_("An error occured whilst connnecting: ") + CardDAVConn.GetErrorMessage());