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

This commit is contained in:
John Safranek 2012-05-21 14:21:34 -07:00
commit e48f5a31d6
2 changed files with 6 additions and 2 deletions

View File

@ -37,8 +37,6 @@
#ifdef _WIN32
/* wincrypt.h clashes */
#undef X509_NAME
#undef OCSP_REQUEST
#undef OCSP_RESPONSE
#endif

View File

@ -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