[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  ac879ed62a19f3c878f7be3020a1b93cc77f4b38 (commit)
      from  d4da1bb5ab2b8bb08ec6662262fb6b2e3fdafeef (commit)


- Log -----------------------------------------------------------------
commit ac879ed62a19f3c878f7be3020a1b93cc77f4b38
Author: Benjamin Kaduk <bkaduk at akamai.com>
Date:   Thu Dec 29 11:38:24 2016 -0600

    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 at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/2642)

-----------------------------------------------------------------------

Summary of changes:
 crypto/seed/seed.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/seed/seed.c b/crypto/seed/seed.c
index c1e9285..d62da91 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