diff options
| author | Adam Langley <agl@google.com> | 2015-05-13 22:19:52 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-05-13 22:19:52 +0000 |
| commit | e39b1236482c31fbf1aebfa4d441fbd6c01a74c2 (patch) | |
| tree | 1bae784d24807314c5ee7fde703bd311a1b10343 | |
| parent | 1c89d66d12a9f56287e56c56e4ca081701676478 (diff) | |
| parent | 22b306fd55863901f9d4de6c4193a365e31cbf5b (diff) | |
| download | external_boringssl-e39b1236482c31fbf1aebfa4d441fbd6c01a74c2.zip external_boringssl-e39b1236482c31fbf1aebfa4d441fbd6c01a74c2.tar.gz external_boringssl-e39b1236482c31fbf1aebfa4d441fbd6c01a74c2.tar.bz2 | |
am 22b306fd: external/boringssl: update #define guards for x86_64-gcc.c.
* commit '22b306fd55863901f9d4de6c4193a365e31cbf5b':
external/boringssl: update #define guards for x86_64-gcc.c.
| -rw-r--r-- | src/crypto/bn/asm/x86_64-gcc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/crypto/bn/asm/x86_64-gcc.c b/src/crypto/bn/asm/x86_64-gcc.c index ac63934..0496b95 100644 --- a/src/crypto/bn/asm/x86_64-gcc.c +++ b/src/crypto/bn/asm/x86_64-gcc.c @@ -1,6 +1,6 @@ #include <openssl/bn.h> -#if defined(OPENSSL_X86_64) && !defined(OPENSSL_WINDOWS) +#if !defined(OPENSSL_NO_ASM) && defined(OPENSSL_X86_64) && !defined(OPENSSL_WINDOWS) #include "../internal.h" @@ -596,4 +596,4 @@ void bn_sqr_comba4(BN_ULONG *r, const BN_ULONG *a) { r[7] = c2; } -#endif /* defined(OPENSSL_X86_64) && !defined(OPENSSL_WINDOWS) */ +#endif /* !NO_ASM && X86_64 && !WINDOWS */ |