[#3726] Protected PROTOCOL_VERSION in Botan wrapper

isc-projects · Jan 31, 2025 · b4eb89b · b4eb89b
1 parent ce219fb
commit b4eb89b
Showing 1 changed file with 12 additions and 0 deletions.
diff --git 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