From 0d0893f2b9d0249f4f0751cb11dd016ce439a6c6 Mon Sep 17 00:00:00 2001
From: Gisle Vanem <gvanem@broadpark.no>
Date: Thu, 14 Jun 2012 01:51:51 +0200
Subject: 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
---
 lib/urldata.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'lib')

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
 
-- 
cgit v1.2.3