From: Benjamin Kaduk <bkaduk@akamai.com>
Date: Thu, 29 Dec 2016 17:38:24 +0000 (-0600)
Subject: Use _WIN32 over WIN32 for preprocessor conditional
X-Git-Tag: OpenSSL_1_1_0f~238
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=88a3b5322170444d8d4003f6d8af82c3976c570b;p=oweals%2Fopenssl.git

Use _WIN32 over WIN32 for preprocessor conditional

The intent seems to be that the WIN32 symbol is for things that are a direct
byproduct of being a windows-variant configuration and should be used for
feature en/disablement on windows systems.  Use of the _WIN32 symbol is more
widespread, being used to implement platform portability of more generic code.

We do define WIN32 in some situations in e_os.h, but that is not included
universally.

Reviewed-by: Andy Polyakov <appro@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2642)
(cherry picked from commit ac879ed62a19f3c878f7be3020a1b93cc77f4b38)
---

diff --git a/crypto/seed/seed.c b/crypto/seed/seed.c
index c1e9285162..d62da91ede 100644
--- a/crypto/seed/seed.c
+++ b/crypto/seed/seed.c
@@ -37,7 +37,7 @@
 # include <stdio.h>
 # include <stdlib.h>
 # include <string.h>
-# ifdef WIN32
+# ifdef _WIN32
 #  include <memory.h>
 # endif