From: Gisle Vanem <gvanem@broadpark.no>
Date: Wed, 13 Jun 2012 23:51:51 +0000 (+0200)
Subject: urldata.h: fix cyassl/openssl/ssl.h build clash with wincrypt.h
X-Git-Tag: curl-7_27_0~188
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0d0893f2b9d0249f4f0751cb11dd016ce439a6c6;p=thirdparty%2Fcurl.git

urldata.h: fix cyassl/openssl/ssl.h build clash with wincrypt.h

Building with CyaSSL failed compilation. Reason being that OCSP_REQUEST and
OCSP_RESPONSE are enum values in CyaSSL and defines in <wincrypt.h> included
via <winldap.h> in ldap.c.

http://curl.haxx.se/mail/lib-2012-06/0196.html
---

diff --git a/lib/urldata.h b/lib/urldata.h
index 20e339bf94..ae6326a4e5 100644
--- a/lib/urldata.h
+++ b/lib/urldata.h
@@ -112,6 +112,8 @@
 #endif
 
 #ifdef USE_CYASSL
+#undef OCSP_REQUEST  /* avoid cyassl/openssl/ssl.h clash with wincrypt.h */
+#undef OCSP_RESPONSE /* avoid cyassl/openssl/ssl.h clash with wincrypt.h */
 #include <cyassl/openssl/ssl.h>
 #endif