Merge pull request #658 from TheoXD/_windows_openssl2_fix

Someone fixed compiling issue on Win
This commit is contained in:
Juan Linietsky 2014-09-17 09:53:17 -03:00
commit 431c0c6903
2 changed files with 6 additions and 1 deletions

View file

@ -63,7 +63,11 @@
#if !defined(OPENSSL_IMPLEMENTS_strncasecmp) && \ #if !defined(OPENSSL_IMPLEMENTS_strncasecmp) && \
!defined(OPENSSL_SYSNAME_WIN32) && \ !defined(OPENSSL_SYSNAME_WIN32) && \
!defined(NETWARE_CLIB) !defined(NETWARE_CLIB)
# include <strings.h> #ifdef _WIN32
#include <string.h>
#else
#include <strings.h>
#endif
#endif #endif
int OPENSSL_strncasecmp(const char *str1, const char *str2, size_t n) int OPENSSL_strncasecmp(const char *str1, const char *str2, size_t n)

View file

@ -64,6 +64,7 @@
#include <openssl/e_os2.h> #include <openssl/e_os2.h>
#if defined(OPENSSL_SYS_WINDOWS) #if defined(OPENSSL_SYS_WINDOWS)
#define WIN32_LEAN_AND_MEAN
#include <windows.h> #include <windows.h>
#ifdef OCSP_RESPONSE #ifdef OCSP_RESPONSE
#undef OCSP_RESPONSE #undef OCSP_RESPONSE