Things merged from the main trunk, among others some well needed Win32

fixes.
2000-06-23 22:24:53 +00:00
parent ccd98b43ed
commit 1b2f8b6e2a
48 changed files with 1256 additions and 1103 deletions
--- a/crypto/rand/rand_win.c
+++ b/crypto/rand/rand_win.c
@@ -110,7 +110,8 @@
 */


-#ifdef WINDOWS
+#if defined(WINDOWS) || defined(WIN32)
+#include "cryptlib.h"
 #include <windows.h>
 #include <openssl/rand.h>
 /* XXX There are probably other includes missing here ... */