diff options
Diffstat (limited to '')
| -rw-r--r-- | drivers/builtin_openssl2/e_os.h (renamed from drivers/builtin_openssl/e_os.h) | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/drivers/builtin_openssl/e_os.h b/drivers/builtin_openssl2/e_os.h index 9fcb8fbe2..e801b4106 100644 --- a/drivers/builtin_openssl/e_os.h +++ b/drivers/builtin_openssl2/e_os.h @@ -145,7 +145,6 @@ extern "C" { #endif #if defined(WINDOWS) - #define get_last_socket_error() WSAGetLastError() #define clear_socket_error() WSASetLastError(0) #define readsocket(s,b,n) recv((s),(b),(n),0) @@ -283,12 +282,23 @@ extern "C" { # include <ws2tcpip.h> /* yes, they have to be #included prior to <windows.h> */ # endif -#define WIN32_LEAN_AND_MEAN # include <windows.h> # include <stdio.h> # include <stddef.h> # include <errno.h> # include <string.h> + + +#ifdef X509_NAME +#undef X509_NAME +#undef X509_NAME +#undef X509_EXTENSIONS +#undef X509_CERT_PAIR +#undef PKCS7_ISSUER_AND_SERIAL +#undef OCSP_REQUEST +#undef OCSP_RESPONSE +#endif + # ifdef _WIN64 # define strlen(s) _strlen31(s) /* cut strings to 2GB */ |