[openssl-commits] [openssl] master update

[Andy Polyakov]

The branch master has been updated
       via  9d9dc6ac852a74836ba15a3ed10b3ecb6581fd1b (commit)
      from  4af14b7b018750bf3584587068211948924738fb (commit)


- Log -----------------------------------------------------------------
commit 9d9dc6ac852a74836ba15a3ed10b3ecb6581fd1b
Author: Andy Polyakov <appro at openssl.org>
Date:   Mon Mar 19 18:12:31 2018 +0100

    o_fopen.c,rand/randfile.c: compensate for e_os.h omission.
    
    At earlier point e_os.h was omitted from a number of headers (in order
    to emphasize OS neutrality), but this affected o_fopen.c and randfile.c
    which are not OS-neutral, and contain some Win32-specific code.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/5676)

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

Summary of changes:
 crypto/o_fopen.c       |  3 +++
 crypto/rand/randfile.c | 12 +++++-------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/crypto/o_fopen.c b/crypto/o_fopen.c
index a3a0065..951d034 100644
--- a/crypto/o_fopen.c
+++ b/crypto/o_fopen.c
@@ -12,6 +12,9 @@
 #if !defined(OPENSSL_NO_STDIO)
 
 # include <stdio.h>
+# ifdef _WIN32
+#  include <windows.h>
+# endif
 
 FILE *openssl_fopen(const char *filename, const char *mode)
 {
diff --git a/crypto/rand/randfile.c b/crypto/rand/randfile.c
index d4edc50..a979eb9 100644
--- a/crypto/rand/randfile.c
+++ b/crypto/rand/randfile.c
@@ -26,7 +26,12 @@
 # include <sys/stat.h>
 # include <fcntl.h>
 # ifdef _WIN32
+#  include <windows.h>
 #  include <io.h>
+#  define stat    _stat
+#  define chmod   _chmod
+#  define open    _open
+#  define fdopen  _fdopen
 # endif
 #endif
 
@@ -41,13 +46,6 @@
 #   define S_ISREG(m) ((m) & S_IFREG)
 # endif
 
-#ifdef _WIN32
-# define stat    _stat
-# define chmod   _chmod
-# define open    _open
-# define fdopen  _fdopen
-#endif
-
 #define RAND_FILE_SIZE 1024
 #define RFILE ".rnd"