[openssl-commits] [openssl] master update

[paul.dale at oracle.com]

The branch master has been updated
       via  bed4afa81b9c94596cae44226e7506d9b07fe5a5 (commit)
      from  2b66fd5720c38c6e89f9cd00d36d2c828ed4cd4b (commit)


- Log -----------------------------------------------------------------
commit bed4afa81b9c94596cae44226e7506d9b07fe5a5
Author: Pauli <paul.dale at oracle.com>
Date:   Wed Feb 7 11:46:15 2018 +1000

    Fix glibc specific conditional for Mac OS/X
    
    MacOS seems to define __GLIBC__ but not __GLIBC_PREREQ.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/5269)

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

Summary of changes:
 crypto/rand/rand_lib.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/crypto/rand/rand_lib.c b/crypto/rand/rand_lib.c
index 810677b..69c3c79 100644
--- a/crypto/rand/rand_lib.c
+++ b/crypto/rand/rand_lib.c
@@ -231,7 +231,8 @@ static uint64_t get_timer_bits(void)
 # if defined(_POSIX_C_SOURCE) \
      && defined(_POSIX_TIMERS) \
      && _POSIX_C_SOURCE >= 199309L \
-     && (!defined(__GLIBC__) || __GLIBC_PREREQ(2, 17))
+     && (!defined(__GLIBC__) \
+         || (defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 17)))
     {
         struct timespec ts;
         clockid_t cid;