Common/FileSystem: Don't include malloc.h on macOS

5 years ago · 4681f9d744
parent 33f3ab4d86
commit 4681f9d744
1 changed files with 6 additions and 2 deletions
--- 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
+} // namespace FileSystem