[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  e51329d3815df95bf0ff66925c3961794f4c66d1 (commit)
      from  befe31cd3839a7bf9d62b279ace71a0efbdd39b0 (commit)


- Log -----------------------------------------------------------------
commit e51329d3815df95bf0ff66925c3961794f4c66d1
Author: Matt Caswell <matt at openssl.org>
Date:   Wed May 11 11:18:57 2016 +0100

    OpenBSD doesn't have ucontext.h so don't try and include it
    
    On OpenBSD we turn off async capabilities due to no ucontext.h.
    
    RT#4379
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 crypto/async/arch/async_posix.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/crypto/async/arch/async_posix.h b/crypto/async/arch/async_posix.h
index e0099c3..0d9245e 100644
--- a/crypto/async/arch/async_posix.h
+++ b/crypto/async/arch/async_posix.h
@@ -11,7 +11,9 @@
 #define OPENSSL_ASYNC_ARCH_ASYNC_POSIX_H
 #include <openssl/e_os2.h>
 
-#if (defined(OPENSSL_SYS_UNIX) || defined(OPENSSL_SYS_CYGWIN)) && defined(OPENSSL_THREADS) && !defined(OPENSSL_NO_ASYNC) && !defined(__ANDROID__)
+#if (defined(OPENSSL_SYS_UNIX) || defined(OPENSSL_SYS_CYGWIN)) \
+    && defined(OPENSSL_THREADS) && !defined(OPENSSL_NO_ASYNC) \
+    && !defined(__ANDROID__) && !defined(__OpenBSD__)
 
 # include <unistd.h>