]> git.ipfire.org Git - thirdparty/curl.git/commitdiff
urldata.h: fix cyassl/openssl/ssl.h build clash with wincrypt.h
authorGisle Vanem <gvanem@broadpark.no>
Wed, 13 Jun 2012 23:51:51 +0000 (01:51 +0200)
committerYang Tse <yangsita@gmail.com>
Wed, 13 Jun 2012 23:51:51 +0000 (01:51 +0200)
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

index 20e339bf94e9b4216f5a9fcfc946ea4c21aceda0..ae6326a4e5460770a235eb00fe79b2d1e6f0fb9f 100644 (file)
 #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