Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

amd64/bn_arch.h: avoid redefinition of OPENSSL_NO_ASM #940

Merged
merged 1 commit into from
Nov 8, 2023

Conversation

vszakats
Copy link
Contributor

@vszakats vszakats commented Nov 8, 2023

Fixes this warning when OPENSSL_NO_ASM is already set by the build system (seen with CMake):

In file included from ./crypto/bn/bn_mul.c:65:
./crypto/bn/arch/amd64/bn_arch.h:24:9: warning: 'OPENSSL_NO_ASM' macro redefined [-Wmacro-redefined]
        ^
<command line>:10:9: note: previous definition is here
        ^

Reported in #910

Fixes this warning when `OPENSSL_NO_ASM` is already set by the build
system (seen with CMake):
```
In file included from ./libressl/crypto/bn/bn_mul.c:65:
./libressl/crypto/bn/arch/amd64/bn_arch.h:24:9: warning: 'OPENSSL_NO_ASM' macro redefined [-Wmacro-redefined]
        ^
<command line>:10:9: note: previous definition is here
        ^
```

Reported in libressl#910
@busterb busterb self-assigned this Nov 8, 2023
busterb added a commit that referenced this pull request Nov 8, 2023
@busterb busterb merged commit 43cb91c into libressl:master Nov 8, 2023
33 checks passed
@vszakats vszakats deleted the win-amd64-redef branch November 8, 2023 12:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants