aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGisle Vanem <gvanem@broadpark.no>2012-06-14 01:51:51 +0200
committerYang Tse <yangsita@gmail.com>2012-06-14 01:51:51 +0200
commit0d0893f2b9d0249f4f0751cb11dd016ce439a6c6 (patch)
treebff490a1139df3acaf4e5f0d4e272f1ffa9cc405
parent2bfa57bc32a166af9453326f53ad3683bc04615d (diff)
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
-rw-r--r--lib/urldata.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/urldata.h b/lib/urldata.h
index 20e339bf9..ae6326a4e 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