From: Steve Brokenshire <sbrokenshire@xestia.co.uk>
Date: Fri, 27 May 2016 22:22:18 +0000 (+0100)
Subject: Check for __WIN32__ in addition to __APPLE__
X-Git-Tag: release-0.13~5
X-Git-Url: http://Server1/repobrowser/?p=xestiaab%2F.git;a=commitdiff_plain;h=51508462484a87e7c2e448ec3aff643784381a09

Check for __WIN32__ in addition to __APPLE__
---

diff --git a/source/carddav/carddav-contactlist.cpp b/source/carddav/carddav-contactlist.cpp
index ab0cf09..6990876 100644
--- a/source/carddav/carddav-contactlist.cpp
+++ b/source/carddav/carddav-contactlist.cpp
@@ -154,7 +154,7 @@ ContactListData CardDAV::GetContactList(wxString SyncTokenInc){
 		curl_easy_setopt(conn, CURLOPT_HTTPHEADER, slist);
 		curl_easy_setopt(conn, CURLOPT_CERTINFO, 1);
 
-#if defined(__APPLE__)
+#if defined(__APPLE__) || defined(__WIN32__)
 		
 #else
 		
diff --git a/source/carddav/carddav-processdata.cpp b/source/carddav/carddav-processdata.cpp
index 55a353f..1e5a603 100644
--- a/source/carddav/carddav-processdata.cpp
+++ b/source/carddav/carddav-processdata.cpp
@@ -129,7 +129,7 @@ void CardDAV::ProcessDataThread(){
 		
 		}
 
-#if defined(__APPLE__)
+#if defined(__APPLE__) || defined(__WIN32__)
 		
 #else
 		
diff --git a/source/carddav/carddav-servercontact.cpp b/source/carddav/carddav-servercontact.cpp
index 1ebc1df..a3c70c3 100644
--- a/source/carddav/carddav-servercontact.cpp
+++ b/source/carddav/carddav-servercontact.cpp
@@ -101,7 +101,7 @@ void CardDAV::GetServerContactData()
 		curl_easy_setopt(conn, CURLOPT_WRITEHEADER, &PageHeader);
 		curl_easy_setopt(conn, CURLOPT_NOSIGNAL, 1);
 
-#if defined(__APPLE__)
+#if defined(__APPLE__) || defined(__WIN32__)
 		
 #else
 		
diff --git a/source/carddav/carddav-serveretag.cpp b/source/carddav/carddav-serveretag.cpp
index 5ac3f27..8784218 100644
--- a/source/carddav/carddav-serveretag.cpp
+++ b/source/carddav/carddav-serveretag.cpp
@@ -115,7 +115,7 @@ void CardDAV::GetServerETagValueThread()
 		curl_easy_setopt(conn, CURLOPT_POSTFIELDS, query);
 		curl_easy_setopt(conn, CURLOPT_POSTFIELDSIZE, strlen(query));
 
-#if defined(__APPLE__)
+#if defined(__APPLE__) || defined(__WIN32__)
 		
 #else
 		
diff --git a/source/carddav/carddav-sslverify.cpp b/source/carddav/carddav-sslverify.cpp
index ac861b0..5d81bb3 100644
--- a/source/carddav/carddav-sslverify.cpp
+++ b/source/carddav/carddav-sslverify.cpp
@@ -90,6 +90,9 @@ CURLcode CardDAV::SSLVerifyTest(){
 			// Connection is OK. Do nothing.
 
 			*ServerResult = TRUE;
+			
+#if !defined(__APPLE__) && !defined(__WIN32__)
+			
 
 		} else if (conncode == CURLE_SSL_CACERT || conncode == CURLE_SSL_CONNECT_ERROR){