Commit 1669b7b5 authored by Matt Caswell's avatar Matt Caswell
Browse files

Rename BoringSSL style OPENSSL_WINDOWS to OPENSSL_SYS_WINDOWS 



Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
parent 1c8235c9

test/ossl_shim/ossl_shim.cc

+2 −2
Original line number Diff line number Diff line
@@ -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;

test/ossl_shim/packeted_bio.h

+1 −1
Original line number Diff line number Diff line
@@ -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))