From: Brad Smith <brad@comstyle.com>
Date: Mon, 1 Aug 2022 18:57:34 +0000 (-0400)
Subject: Eliminate conflict with OpenBSD's swap32 macro
X-Git-Tag: nettle_3.9_release_20230514~90
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e83d3a8010a295a2f4d0d331b5574cc1aef83e43;p=thirdparty%2Fnettle.git

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>
---

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