From 3c230ba1bfbc013ef85c3e0d364027b1c9bb585a Mon Sep 17 00:00:00 2001
From: Stenzek <stenzek@gmail.com>
Date: Wed, 3 Jul 2024 16:04:05 +1000
Subject: [PATCH] PlatformMisc: Swap include order for Mac

---
 src/util/platform_misc_mac.mm | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/util/platform_misc_mac.mm b/src/util/platform_misc_mac.mm
index 9a76fcba2..721eaf39b 100644
--- a/src/util/platform_misc_mac.mm
+++ b/src/util/platform_misc_mac.mm
@@ -1,13 +1,7 @@
 // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin <stenzek@gmail.com>
 // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0)
 
-#include "metal_layer.h"
-#include "platform_misc.h"
-#include "window_info.h"
-
-#include "common/log.h"
-#include "common/small_string.h"
-
+// Normally, system includes come last. But apparently some of our macro names are redefined...
 #include <Cocoa/Cocoa.h>
 #include <IOKit/pwr_mgt/IOPMLib.h>
 #include <QuartzCore/QuartzCore.h>
@@ -16,6 +10,13 @@
 #include <sys/sysctl.h>
 #include <vector>
 
+#include "metal_layer.h"
+#include "platform_misc.h"
+#include "window_info.h"
+
+#include "common/log.h"
+#include "common/small_string.h"
+
 Log_SetChannel(PlatformMisc);
 
 #if __has_feature(objc_arc)