From: Francis Dupont <fdupont@isc.org>
Date: Sat, 25 Jan 2025 14:39:21 +0000 (+0100)
Subject: [#3726] Protected PROTOCOL_VERSION in Botan wrapper
X-Git-Tag: Kea-2.7.7~289
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b4eb89b8a8b5bb6278d00f9e7ff43a2c39dcd876;p=thirdparty%2Fkea.git

[#3726] Protected PROTOCOL_VERSION in Botan wrapper
---

diff --git a/src/lib/asiolink/botan_wrapper.h b/src/lib/asiolink/botan_wrapper.h
index 09d14838de..1fa2421202 100644
--- a/src/lib/asiolink/botan_wrapper.h
+++ b/src/lib/asiolink/botan_wrapper.h
@@ -21,8 +21,20 @@
 #pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
 #endif
 
+/// MariaDB defines PROTOCOL_VERSION which is also in a Botan enum...
+
+#ifdef PROTOCOL_VERSION
+#define BOTAN_BACKUP_FOR_PROTOCOL_VERSION PROTOCOL_VERSION
+#undef PROTOCOL_VERSION
+#endif
+
 #include <botan/asio_error.h>
 
+#ifdef BOTAN_BACKUP_FOR_PROTOCOL_VERSION
+#define PROTOCOL_VERSION BOTAN_BACKUP_FOR_PROTOCOL_VERSION
+#undef BOTAN_BACKUP_FOR_PROTOCOL_VERSION
+#endif
+
 #if defined(__GNUC__) || defined(__clang__)
 #pragma GCC diagnostic pop
 #endif