diff options
| author | Brad Smith <brad@comstyle.com> | 2022-08-01 14:57:34 -0400 |
|---|---|---|
| committer | Niels Möller <nisse@lysator.liu.se> | 2022-08-04 10:31:18 +0200 |
| commit | e83d3a8010a295a2f4d0d331b5574cc1aef83e43 (patch) | |
| tree | 6b4c19f1546bc19ad2b37de4d022126300039f81 | |
| parent | a2b05950348cc3ddad6f4b3733d4767f2d4f15aa (diff) | |
| download | nettle-e83d3a8010a295a2f4d0d331b5574cc1aef83e43.tar.gz | |
Eliminate conflict with OpenBSD's swap32 macro
blowfish-bcrypt.c:152:33: error: too many arguments provided to function-like macro invocation
static void swap32(uint32_t *x, int count)
^
/usr/include/sys/endian.h:71:9: note: macro 'swap32' defined here
Signed-off-by: Brad Smith <brad@comstyle.com>
| -rw-r--r-- | blowfish-bcrypt.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/blowfish-bcrypt.c b/blowfish-bcrypt.c index 64858880..800d1468 100644 --- a/blowfish-bcrypt.c +++ b/blowfish-bcrypt.c @@ -149,6 +149,9 @@ static uint32_t magic_w[6] = { 0x64657253, 0x63727944, 0x6F756274 }; +/* conflicts with OpenBSD's swap32 macro */ +#undef swap32 + static void swap32(uint32_t *x, int count) { #if !WORDS_BIGENDIAN |