Fixed cleaning of old object files

[xestiaab/.git] / source / carddav / carddav.h

diff --git a/source/carddav/carddav.h b/source/carddav/carddav.h
index 81269bc..d4ac957 100644 (file)
--- a/source/carddav/carddav.h
+++ b/source/carddav/carddav.h
@@ -25,6 +25,15 @@
 #include <libxml/parser.h>
 #include <libxml/tree.h>
 #include <curl/curl.h>
+#if defined(__WIN32__)
+#include <Windows.h>
+#include <basetsd.h>
+#include <winapifamily.h>
+#include <security.h>
+#include <schannel.h>
+#include <cryptuiapi.h>
+#include <sspi.h>
+#endif
 #include "../vcard/vcard.h"
 #include "../actmgr/frmActivityMgr.h"
 #include "../common/sslcertstructs.h"
@@ -107,10 +116,16 @@ class CardDAV
                wxString ETagValueResult();
                wxString GetErrorMessage();
                static size_t WritebackFunc(char *ptr, size_t size, size_t nmemb, wxString *stream);
+#if defined(__APPLE__) || defined(__WIN32__)
                static CURL* GetConnectionObject();
                static void SetConnectionObject(CURL *ConnectionObject);
+#endif
+
 #if defined(__APPLE__)
                SecTrustRef GetTrustObject();
+#elif defined(__WIN32__)
+               PCCERT_CONTEXT GetCertificateContextPointer();
+               CERT_CONTEXT GetCertificateContext();
 #endif
     
                // SSL Verification tests when connecting.
@@ -120,10 +135,14 @@ class CardDAV
 
                //size_t WritebackFunc(char *ptr, size_t size, size_t nmemb, FILE *userdata);
        private:
+#if defined(__APPLE__) || defined(__WIN32__)
+               static CURL* ConnectionObject;
+#endif
 #if defined(__APPLE__)
                static SSLContext *SSLContextPointer;
                static SecTrustRef SecTrustObject;
-               static CURL* ConnectionObject;
+#elif defined(__WIN32__)
+               static PCCERT_CONTEXT CertificateData;
 #endif
                static wxString ServerAddress;
                static int ServerPort;