diff options
| author | Adam Langley <agl@google.com> | 2015-05-13 22:13:19 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-05-13 22:13:19 +0000 |
| commit | 0bef1b0537b1ab4c3b450f53916fdc3f8bc792e4 (patch) | |
| tree | 1bae784d24807314c5ee7fde703bd311a1b10343 | |
| parent | 8149f60602caab1919c15c7915da04699bc8a927 (diff) | |
| parent | 9eb412c41ab99313c5909fba90801c3bff404a10 (diff) | |
| download | external_boringssl-0bef1b0537b1ab4c3b450f53916fdc3f8bc792e4.zip external_boringssl-0bef1b0537b1ab4c3b450f53916fdc3f8bc792e4.tar.gz external_boringssl-0bef1b0537b1ab4c3b450f53916fdc3f8bc792e4.tar.bz2 | |
am 9eb412c4: external/boringssl: update #define guards for x86_64-gcc.c.
* commit '9eb412c41ab99313c5909fba90801c3bff404a10':
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 */ |