wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename BoringSSL style OPENSSL_WINDOWS to OPENSSL_SYS_WINDOWS

Browse source 
Reviewed-by: Richard Levitte <levitte@openssl.org>
This commit is contained in:
Matt Caswell 2016-10-19 11:37:17 +01:00
parent 1c8235c9b3
commit 1669b7b587
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
test/ossl_shim/ossl_shim.cc
View file

@ -504,7 +504,7 @@ class SocketCloser {
// Half-close and drain the socket before releasing it. This seems to be
// necessary for graceful shutdown on Windows. It will also avoid write
// failures in the test runner.
#if defined(OPENSSL_WINDOWS)
#if defined(OPENSSL_SYS_WINDOWS)
shutdown(sock_, SD_SEND);
#else
shutdown(sock_, SHUT_WR);
@ -1207,7 +1207,7 @@ static int Main(int argc, char **argv) {
// Anything following this line will be considered an error.
StderrDelimiter delimiter;
#if defined(OPENSSL_WINDOWS)
#if defined(OPENSSL_SYS_WINDOWS)
/* Initialize Winsock. */
WORD wsa_version = MAKEWORD(2, 2);
WSADATA wsa_data;

2
test/ossl_shim/packeted_bio.h
View file

@ -18,7 +18,7 @@
#include <openssl/base.h>
#include <openssl/bio.h>
#if defined(OPENSSL_WINDOWS)
#if defined(OPENSSL_SYS_WINDOWS)
OPENSSL_MSVC_PRAGMA(warning(push, 3))
#include <winsock2.h>
OPENSSL_MSVC_PRAGMA(warning(pop))