[openssl-commits] [openssl] OpenSSL_1_1_0-stable update

[Richard Levitte]

The branch OpenSSL_1_1_0-stable has been updated
       via  69bb97c6d65250324a65fbb6fcac3fefb59d242a (commit)
      from  b757d2d82fd3ed4028d505b645258c9d97115443 (commit)


- Log -----------------------------------------------------------------
commit 69bb97c6d65250324a65fbb6fcac3fefb59d242a
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Feb 22 19:50:33 2017 +0100

    Fix typo, missing ||
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/2707)
    (cherry picked from commit 6eb837583758506607f538fe2a3dd87925e4e69d)

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

Summary of changes:
 crypto/o_dir.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/o_dir.c b/crypto/o_dir.c
index 50b4533..7019383 100644
--- a/crypto/o_dir.c
+++ b/crypto/o_dir.c
@@ -24,7 +24,7 @@
 
 #define LPDIR_H
 #if defined OPENSSL_SYS_UNIX || defined DJGPP \
-    (defined __VMS_VER && __VMS_VER >= 70000000)
+    || (defined __VMS_VER && __VMS_VER >= 70000000)
 # include "LPdir_unix.c"
 #elif defined OPENSSL_SYS_VMS
 # include "LPdir_vms.c"