diff options
author | Adam Langley <agl@chromium.org> | 2014-08-27 00:38:19 +0400 |
---|---|---|
committer | Adam Langley <agl@google.com> | 2014-08-27 02:07:14 +0400 |
commit | 98ad22ec7ae21bdf5d5509049504b3632bfdbf93 (patch) | |
tree | 1453c2890352be2f312b2880ca1917ed4545806f /crypto/internal.h | |
parent | 58f90951eb8d4393925d3155a69be49236816f82 (diff) |
Fix "integer constant is too large for 'long' type" errors.
(Based on Piotr Sikora's change:
https://boringssl-review.googlesource.com/#/c/1361)
Change-Id: I7b62b81f4e4ef3064eee1b39334dc2e50d17f163
Reviewed-on: https://boringssl-review.googlesource.com/1641
Reviewed-by: Adam Langley <agl@google.com>
Diffstat (limited to 'crypto/internal.h')
-rw-r--r-- | crypto/internal.h | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/crypto/internal.h b/crypto/internal.h index 84642395..39d35adb 100644 --- a/crypto/internal.h +++ b/crypto/internal.h @@ -109,7 +109,7 @@ #ifndef OPENSSL_HEADER_CRYPTO_INTERNAL_H #define OPENSSL_HEADER_CRYPTO_INTERNAL_H -#include <openssl/base.h> +#include <openssl/ex_data.h> /* st_CRYPTO_EX_DATA_IMPL contains an ex_data implementation. See the comments @@ -128,6 +128,19 @@ struct st_CRYPTO_EX_DATA_IMPL { }; +#if defined(OPENSSL_WINDOWS) +#define OPENSSL_U64(x) x##UI64 +#else + +#if defined(OPENSSL_64_BIT) +#define OPENSSL_U64(x) x##UL +#else +#define OPENSSL_U64(x) x##ULL +#endif + +#endif /* OPENSSL_WINDOWS */ + + #if defined(__cplusplus) } /* extern C */ #endif |