From: Pauli <paul.dale@oracle.com>
Date: Wed, 7 Feb 2018 01:46:15 +0000 (+1000)
Subject: Fix glibc specific conditional for Mac OS/X
X-Git-Tag: OpenSSL_1_1_1-pre1~44
X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=bed4afa81b9c94596cae44226e7506d9b07fe5a5

Fix glibc specific conditional for Mac OS/X

MacOS seems to define __GLIBC__ but not __GLIBC_PREREQ.

Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5269)
---

diff --git a/crypto/rand/rand_lib.c b/crypto/rand/rand_lib.c
index 810677b79b..69c3c79c6d 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;