X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcarddav%2Fcarddav.h;h=d4ac957a5cf896e6d4d3f6731be9d85e02b8dcfb;hb=7195b19cb9b6bac69a55acdffabaec237dc67e78;hp=40df888e53ae094ffb583fc7d49a5de3c8726c45;hpb=4e8ed32926425840c4367d90a9145ded0d65dc2a;p=xestiaab%2F.git diff --git a/source/carddav/carddav.h b/source/carddav/carddav.h index 40df888..d4ac957 100644 --- a/source/carddav/carddav.h +++ b/source/carddav/carddav.h @@ -25,6 +25,15 @@ #include #include #include +#if defined(__WIN32__) +#include +#include +#include +#include +#include +#include +#include +#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,11 +135,15 @@ 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; +#elif defined(__WIN32__) + static PCCERT_CONTEXT CertificateData; #endif - static CURL* ConnectionObject; static wxString ServerAddress; static int ServerPort; static wxString ServerUser;