diff options
| author | Adam Langley <agl@google.com> | 2015-05-20 23:30:11 +0300 |
|---|---|---|
| committer | Adam Langley <agl@google.com> | 2015-05-20 23:30:11 +0300 |
| commit | 0d1d0d5c1ffcf0a36dfc0f3184c76b38858a8874 (patch) | |
| tree | 819dba68ba80b5d53c0874a6d37e72dca9e511a9 /crypto/internal.h | |
| parent | 7b348dc1d8af77d4bc186c0f39d7f4c0901d26d4 (diff) | |
Try again to only test __STDC_VERSION__ when defined.
6e1f6456 tried to do this, but MSVC doesn't short-circuit #if
statements. So this change tries having the test be in a different #if.
Change-Id: Id0074770c166a2b7cd9ba2c8cd06245a68b77af8
Diffstat (limited to 'crypto/internal.h')
| -rw-r--r-- | crypto/internal.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/crypto/internal.h b/crypto/internal.h index 8c38279b..50b9a400 100644 --- a/crypto/internal.h +++ b/crypto/internal.h @@ -356,14 +356,15 @@ OPENSSL_EXPORT void CRYPTO_once(CRYPTO_once_t *once, void (*init)(void)); /* Reference counting. */ -#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L && \ - !defined(__STDC_NO_ATOMICS__) +#if defined(__STDC_VERSION__) +#if __STDC_VERSION__ >= 201112L && !defined(__STDC_NO_ATOMICS__) /* OSX's atomic support is broken: the compiler sets the right macros but * stdatomic.h is missing. */ #if !defined(OPENSSL_APPLE) #define OPENSSL_C11_ATOMIC #endif #endif +#endif /* CRYPTO_REFCOUNT_MAX is the value at which the reference count saturates. */ #define CRYPTO_REFCOUNT_MAX 0xffffffff |