X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcarddav%2Fcarddav.h;h=9bdd97398c9ccb19e39128af2ea8f2167491f3a0;hb=66e841c8847db860ad378b330ae5344554f53d35;hp=40df888e53ae094ffb583fc7d49a5de3c8726c45;hpb=4e8ed32926425840c4367d90a9145ded0d65dc2a;p=xestiaab%2F.git diff --git a/source/carddav/carddav.h b/source/carddav/carddav.h index 40df888..9bdd973 100644 --- a/source/carddav/carddav.h +++ b/source/carddav/carddav.h @@ -25,6 +25,10 @@ #include #include #include +#if defined(__WIN32__) +#include +#include +#endif #include "../vcard/vcard.h" #include "../actmgr/frmActivityMgr.h" #include "../common/sslcertstructs.h" @@ -107,10 +111,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 +130,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;