Make sure OPENSSL_SYS_... is defined when we need it.

diff --git a/crypto/cast/cast_lcl.h b/crypto/cast/cast_lcl.h
index f11e3b3ee9919d3f3685b9ca0a54756195143a0b..37f41cc6a4dee5730f78080da058684d91d0d48a 100644 (file)
--- a/crypto/cast/cast_lcl.h
+++ b/crypto/cast/cast_lcl.h
@@ -56,13 +56,14 @@
  * [including the GNU Public Licence.]
  */
 
  * [including the GNU Public Licence.]
  */
 

+
+#include "e_os.h"
+

 #ifdef OPENSSL_SYS_WIN32
 #include <stdlib.h>
 #endif
 
 
 #ifdef OPENSSL_SYS_WIN32
 #include <stdlib.h>
 #endif
 
 

-#include "e_os.h" /* OPENSSL_EXTERN */
-

 #ifdef OPENSSL_BUILD_SHLIBCRYPTO
 # undef OPENSSL_EXTERN
 # define OPENSSL_EXTERN OPENSSL_EXPORT
 #ifdef OPENSSL_BUILD_SHLIBCRYPTO
 # undef OPENSSL_EXTERN
 # define OPENSSL_EXTERN OPENSSL_EXPORT

diff --git a/crypto/rand/rand_egd.c b/crypto/rand/rand_egd.c
index a382d93776b9facf27db24084c384120363c3346..dc54e5fa12ea3d0ae5620a6e3736d770b1b2b200 100644 (file)
--- a/crypto/rand/rand_egd.c
+++ b/crypto/rand/rand_egd.c
@@ -54,6 +54,7 @@
  *
  */
 
  *
  */
 

+#include <openssl/e_os2.h>

 #include <openssl/rand.h>
 
 /*
 #include <openssl/rand.h>
 
 /*