From: Steve Brokenshire <sbrokenshire@xestia.co.uk>
Date: Mon, 11 Apr 2016 22:50:31 +0000 (+0100)
Subject: Moved ConnectionObject and subroutines that use it into defined(__APPLE__).
X-Git-Tag: release-0.12~5
X-Git-Url: http://Server1/repobrowser/?p=xestiaab%2F.git;a=commitdiff_plain;h=71b5282bb2ee3a21c714c005a99cb9d859991586

Moved ConnectionObject and subroutines that use it into defined(__APPLE__).
---

diff --git a/source/carddav/carddav.cpp b/source/carddav/carddav.cpp
index bc3a8f7..8cbc71e 100644
--- a/source/carddav/carddav.cpp
+++ b/source/carddav/carddav.cpp
@@ -480,6 +480,8 @@ wxString CardDAV::GetErrorMessage(){
 
 }
 
+#if defined(__APPLE__)
+
 CURL* CardDAV::GetConnectionObject(){
 	
 	// Get the CardDAV connection object.
@@ -494,4 +496,6 @@ void CardDAV::SetConnectionObject(CURL *ConnectionObjectIn){
 	
 	ConnectionObject = ConnectionObjectIn;
 	
-}
\ No newline at end of file
+}
+
+#endif
\ No newline at end of file
diff --git a/source/carddav/carddav.h b/source/carddav/carddav.h
index 40df888..81269bc 100644
--- a/source/carddav/carddav.h
+++ b/source/carddav/carddav.h
@@ -123,8 +123,8 @@ class CardDAV
 #if defined(__APPLE__)
 		static SSLContext *SSLContextPointer;
 		static SecTrustRef SecTrustObject;
-#endif
 		static CURL* ConnectionObject;
+#endif
 		static wxString ServerAddress;
 		static int ServerPort;
 		static wxString ServerUser;