From a6e6cd5788dac6dc26101f4162d7704ca5c274e8 Mon Sep 17 00:00:00 2001 From: comex Date: Mon, 31 Aug 2020 10:22:03 -0400 Subject: maxwell_dma: Rename RenderEnable::Mode::FALSE and TRUE to avoid name conflict On Apple platforms, FALSE and TRUE are defined as macros by , which is included by various system headers. Note that there appear to be no actual users of the names to fix up. --- src/video_core/engines/maxwell_dma.h | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'src/video_core/engines/maxwell_dma.h') diff --git a/src/video_core/engines/maxwell_dma.h b/src/video_core/engines/maxwell_dma.h index 17bd280c4..3c59eeb13 100644 --- a/src/video_core/engines/maxwell_dma.h +++ b/src/video_core/engines/maxwell_dma.h @@ -72,11 +72,13 @@ public: struct RenderEnable { enum class Mode : u32 { - FALSE = 0, - TRUE = 1, - CONDITIONAL = 2, - RENDER_IF_EQUAL = 3, - RENDER_IF_NOT_EQUAL = 4, + // Note: This uses Pascal case in order to avoid the identifiers + // FALSE and TRUE, which are reserved on Darwin. + False = 0, + True = 1, + Conditional = 2, + RenderIfEqual = 3, + RenderIfNotEqual = 4, }; PackedGPUVAddr address; -- cgit v1.2.3