From: Richard Levitte <levitte@openssl.org>
Date: Tue, 2 Apr 2019 12:40:11 +0000 (+0200)
Subject: Revert "crypto/rand/rand_win.c: include "e_os.h" to get the default _WIN32_WINNT"
X-Git-Tag: OpenSSL_1_1_1c~66
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a88bafcdb7c24a14c277e47cdde014886a91d7cc;p=oweals%2Fopenssl.git

Revert "crypto/rand/rand_win.c: include "e_os.h" to get the default _WIN32_WINNT"

I turns out that this made crypto/rand/rand_win.c to never build with
BCrypt support unless the user sets _WIN32_WINNT.  That wasn't the
intent.

This reverts commit cc8926ec8fcecae89ceab91ef753de93e49568f9.

Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
(Merged from https://github.com/openssl/openssl/pull/8641)

(cherry picked from commit 705a27f7e07c006b167b59070ff635a61f8e0407)
---

diff --git a/crypto/rand/rand_win.c b/crypto/rand/rand_win.c
index f21c894daa..b687081f91 100644
--- a/crypto/rand/rand_win.c
+++ b/crypto/rand/rand_win.c
@@ -11,7 +11,6 @@
 #include <openssl/rand.h>
 #include "rand_lcl.h"
 #include "internal/rand_int.h"
-#include "e_os.h"                /* For a default _WIN32_WINNT */
 #if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32)
 
 # ifndef OPENSSL_RAND_SEED_OS