feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

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

Browse Source
This commit is contained in:
John Safranek
2012-05-21 14:21:34 -07:00
parent 2ed143bee0 4c79ac1f88
commit e48f5a31d6
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cyassl/openssl/ssl.h
View File

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

6
cyassl/ssl.h
View File

@ -43,6 +43,12 @@
#define CYASSL_VERSION LIBCYASSL_VERSION_STRING #define CYASSL_VERSION LIBCYASSL_VERSION_STRING
#endif #endif
#ifdef _WIN32
/* wincrypt.h clashes */
#undef OCSP_REQUEST
#undef OCSP_RESPONSE
#endif
#ifdef __cplusplus #ifdef __cplusplus