X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=e_os.h;h=f3b8fb830de5668df70e124b9395b4df48f338a3;hp=bf317ce6c034f3fe743239b3c906187d7f3a672d;hb=cac19d19e7d6f252ff9aea60d85e0c0fd71a117f;hpb=07016a8a3174db5caf07182930533cf88ad9b0ad

diff --git a/e_os.h b/e_os.h
index bf317ce6c0..f3b8fb830d 100644
--- a/e_os.h
+++ b/e_os.h
@@ -53,14 +53,16 @@ extern "C" {
                              * stand for in ILP32 and LP64 */
 # endif
 
-# define OPENSSL_CONF        "openssl.cnf"
-
 # ifndef DEVRANDOM
 /*
  * set this to a comma-separated list of 'random' device files to try out. By
  * default, we will try to read at least one of these files
  */
-#  define DEVRANDOM "/dev/urandom","/dev/random","/dev/srandom"
+#  if defined(__s390__)
+#   define DEVRANDOM "/dev/prandom","/dev/urandom","/dev/hwrng","/dev/random"
+#  else
+#   define DEVRANDOM "/dev/urandom","/dev/random","/dev/srandom"
+#  endif
 # endif
 # if !defined(OPENSSL_NO_EGD) && !defined(DEVRANDOM_EGD)
 /*
@@ -236,6 +238,12 @@ extern FILE *_imp___iob;
 
 # else                          /* The non-microsoft world */
 
+#  if defined(OPENSSL_SYS_VXWORKS)
+#   include <sys/times.h>
+#  else
+#   include <sys/time.h>
+#  endif
+
 #  ifdef OPENSSL_SYS_VMS
 #   define VMS 1
   /*