diff options
| author | Matt Caswell <matt@openssl.org> | 2016-10-19 11:37:17 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2016-11-04 10:38:54 +0000 |
| commit | 1669b7b58724c800971b817cd7c7400ce6eae547 (patch) | |
| tree | 260fe37c5dd9c46edec112ae57d9696323cc222f /test/ossl_shim | |
| parent | 1c8235c9b3e328d4c8637fd51b1f45adfa6ee446 (diff) | |
Rename BoringSSL style OPENSSL_WINDOWS to OPENSSL_SYS_WINDOWS
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'test/ossl_shim')
| -rw-r--r-- | test/ossl_shim/ossl_shim.cc | 4 | ||||
| -rw-r--r-- | test/ossl_shim/packeted_bio.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/test/ossl_shim/ossl_shim.cc b/test/ossl_shim/ossl_shim.cc index 02917c970f..eb87848d52 100644 --- a/test/ossl_shim/ossl_shim.cc +++ b/test/ossl_shim/ossl_shim.cc @@ -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; diff --git a/test/ossl_shim/packeted_bio.h b/test/ossl_shim/packeted_bio.h index 07930d4708..cdca005763 100644 --- a/test/ossl_shim/packeted_bio.h +++ b/test/ossl_shim/packeted_bio.h @@ -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)) |