diff options
| author | Pauli <paul.dale@oracle.com> | 2018-02-07 02:46:15 +0100 |
|---|---|---|
| committer | Pauli <paul.dale@oracle.com> | 2018-02-07 02:46:15 +0100 |
| commit | bed4afa81b9c94596cae44226e7506d9b07fe5a5 (patch) | |
| tree | e66e51d3b31a643f3bc436350fcfd0ad258a26d8 /crypto | |
| parent | Unify timer code (diff) | |
| download | openssl-bed4afa81b9c94596cae44226e7506d9b07fe5a5.tar.xz openssl-bed4afa81b9c94596cae44226e7506d9b07fe5a5.zip | |
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)
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/rand/rand_lib.c | 3 |
1 files changed, 2 insertions, 1 deletions
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; |