Rename BoringSSL style OPENSSL_WINDOWS to OPENSSL_SYS_WINDOWS
authorMatt Caswell <matt@openssl.org>
Wed, 19 Oct 2016 10:37:17 +0000 (11:37 +0100)
committerMatt Caswell <matt@openssl.org>
Fri, 4 Nov 2016 10:38:54 +0000 (10:38 +0000)
Reviewed-by: Richard Levitte <levitte@openssl.org>
test/ossl_shim/ossl_shim.cc
test/ossl_shim/packeted_bio.h

index 02917c9..eb87848 100644 (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;
index 07930d4..cdca005 100644 (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))