[openssl-commits] [openssl] master update

[Andy Polyakov]

The branch master has been updated
       via  9d71a24ebf57e7157888af1ca587eafe914bf96f (commit)
      from  cb8164b05e3bad5586c2a109bbdbab1ad65a1a6f (commit)


- Log -----------------------------------------------------------------
commit 9d71a24ebf57e7157888af1ca587eafe914bf96f
Author: Andy Polyakov <appro at openssl.org>
Date:   Wed Oct 17 10:09:33 2018 +0200

    arch/async_posix.h: improve portability.
    
    {make|swap|get|set}context are removed in POSIX.1-2008, but glibc
    apparently keeps providing it.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/7420)

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

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

diff --git a/crypto/async/arch/async_posix.h b/crypto/async/arch/async_posix.h
index b07c2cb..62449fe 100644
--- a/crypto/async/arch/async_posix.h
+++ b/crypto/async/arch/async_posix.h
@@ -17,7 +17,8 @@
 
 # include <unistd.h>
 
-# if _POSIX_VERSION >= 200112L
+# if _POSIX_VERSION >= 200112L \
+     && (_POSIX_VERSION < 200809L || defined(__GLIBC__))
 
 # include <pthread.h>