From 4681f9d744aaf5fdb3dffb100e1f8dd739f7d17f Mon Sep 17 00:00:00 2001
From: Connor McLaughlin <stenzek@gmail.com>
Date: Sat, 15 Feb 2020 10:12:55 +0900
Subject: [PATCH] Common/FileSystem: Don't include malloc.h on macOS

---
 src/common/file_system.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/common/file_system.cpp b/src/common/file_system.cpp
index 0318c7231..1f0507807 100644
--- a/src/common/file_system.cpp
+++ b/src/common/file_system.cpp
@@ -5,8 +5,10 @@
 #include "string_util.h"
 #include <algorithm>
 #include <cstring>
+
+#ifndef __APPLE__
 #include <malloc.h>
-Log_SetChannel(FileSystem);
+#endif
 
 #if defined(WIN32)
 #include <shlobj.h>
@@ -18,6 +20,8 @@ Log_SetChannel(FileSystem);
 #include <unistd.h>
 #endif
 
+Log_SetChannel(FileSystem);
+
 namespace FileSystem {
 
 ChangeNotifier::ChangeNotifier(const String& directoryPath, bool recursiveWatch)
@@ -1441,4 +1445,4 @@ bool SetWorkingDirectory(const char* path)
 
 #endif
 
-} // namespace FileSystem
\ No newline at end of file
+} // namespace FileSystem