]> git.ipfire.org Git - thirdparty/nettle.git/commitdiff
Eliminate conflict with OpenBSD's swap32 macro
authorBrad Smith <brad@comstyle.com>
Mon, 1 Aug 2022 18:57:34 +0000 (14:57 -0400)
committerNiels Möller <nisse@lysator.liu.se>
Thu, 4 Aug 2022 08:31:18 +0000 (10:31 +0200)
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>
blowfish-bcrypt.c

index 64858880639f4df063c925abd9591bcad908fff3..800d14688e704ad667d795bb238c76726f38202b 100644 (file)
@@ -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