Merge branch 'master' of github.com:cyassl/cyassl

2012-05-21 14:21:34 -07:00 · 2012-05-21 14:21:34 -07:00 · e48f5a31d6
parent 2ed143bee0 4c79ac1f88
commit e48f5a31d6
2 changed files with 6 additions and 2 deletions
--- a/cyassl/openssl/ssl.h
+++ b/cyassl/openssl/ssl.h
@ -37,8 +37,6 @@
 #ifdef _WIN32
    /* wincrypt.h clashes */
    #undef X509_NAME
-    #undef OCSP_REQUEST 
-    #undef OCSP_RESPONSE
 #endif


--- a/cyassl/ssl.h
+++ b/cyassl/ssl.h
@ -43,6 +43,12 @@
    #define CYASSL_VERSION LIBCYASSL_VERSION_STRING
 #endif

+#ifdef _WIN32
+    /* wincrypt.h clashes */
+    #undef OCSP_REQUEST
+    #undef OCSP_RESPONSE
+#endif
+


 #ifdef __cplusplus