From e83d3a8010a295a2f4d0d331b5574cc1aef83e43 Mon Sep 17 00:00:00 2001 From: Brad Smith Date: Mon, 1 Aug 2022 14:57:34 -0400 Subject: [PATCH] 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 --- blowfish-bcrypt.c | 3 +++ 1 file changed, 3 insertions(+) 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 -- 2.47.2