From be3cb9ad92c74e2b3fa5fa50323f60fd2ab62e8b Mon Sep 17 00:00:00 2001 From: MatthewBeshay <92357869+MatthewBeshay@users.noreply.github.com> Date: Wed, 1 Apr 2026 13:47:25 +1100 Subject: [PATCH] fix: undef stb_vorbis macros leaking into unity build chunks --- .../Common/Source Files/Audio/SoundEngine.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/minecraft/Minecraft.Client/Common/Source Files/Audio/SoundEngine.cpp b/minecraft/Minecraft.Client/Common/Source Files/Audio/SoundEngine.cpp index 34e292f66..d171b90f1 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Audio/SoundEngine.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/Audio/SoundEngine.cpp @@ -48,6 +48,13 @@ int strcasecmp(const char* a, const char* b) { #undef STB_VORBIS_HEADER_ONLY #include "stb_vorbis.c" +// stb_vorbis leaks single-letter macros (C, L, R, etc.) that collide with +// identifiers in other translation units during unity builds. +#undef C +#undef L +#undef R +#undef TRUE +#undef FALSE #endif #if defined(_WINDOWS64) #include "Minecraft.Client/Windows64/Windows64_App.h"