summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Kaduk <bkaduk@akamai.com>2016-12-29 18:38:24 +0100
committerRich Salz <rsalz@openssl.org>2017-02-16 14:59:47 +0100
commitac879ed62a19f3c878f7be3020a1b93cc77f4b38 (patch)
tree003358df2b0e589ecb366051286bc7b1dd22d432
parentUpdate CHANGES and NEWS for new release (diff)
downloadopenssl-ac879ed62a19f3c878f7be3020a1b93cc77f4b38.tar.xz
openssl-ac879ed62a19f3c878f7be3020a1b93cc77f4b38.zip
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)
-rw-r--r--crypto/seed/seed.c2
1 files changed, 1 insertions, 1 deletions
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