From 0b0653fe89542994aa91b0cef674a123ba66bedf Mon Sep 17 00:00:00 2001 From: Steve Brokenshire Date: Tue, 24 May 2016 21:27:45 +0100 Subject: [PATCH] Moved common/win32ssl.h include into the __WIN32__ if section in frmNewAccount.cpp --- source/frmNewAccount.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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 +#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()); -- 2.39.2