From 7b171c56c9513016db4fcb7d502e5be411bdd3c3 Mon Sep 17 00:00:00 2001 From: matcool <26722564+matcool@users.noreply.github.com> Date: Sun, 10 Nov 2024 10:14:46 -0300 Subject: [PATCH] avoid collision with result's geode_concat macro --- loader/include/Geode/DefaultInclude.hpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/loader/include/Geode/DefaultInclude.hpp b/loader/include/Geode/DefaultInclude.hpp index 0190d9e2..19d2fac4 100644 --- a/loader/include/Geode/DefaultInclude.hpp +++ b/loader/include/Geode/DefaultInclude.hpp @@ -18,8 +18,10 @@ return s_##name; \ } -#define GEODE_WRAPPER_CONCAT(x, y) x##y -#define GEODE_CONCAT(x, y) GEODE_WRAPPER_CONCAT(x, y) +#if !defined(GEODE_CONCAT) + #define GEODE_WRAPPER_CONCAT(x, y) x##y + #define GEODE_CONCAT(x, y) GEODE_WRAPPER_CONCAT(x, y) +#endif #define GEODE_WRAPPER_STR(...) #__VA_ARGS__ #define GEODE_STR(...) GEODE_WRAPPER_STR(__VA_ARGS__)