LibAudio+LibCore: Remove workarounds for system header conflicts

This commit could possibly be cherry-picked to serenity
Author: https://github.com/ADKaster Commit: https://github.com/LadybirdBrowser/ladybird/commit/8082daaa3f9 Pull-request: https://github.com/LadybirdBrowser/ladybird/pull/676 Reviewed-by: https://github.com/AtkinsSJ ✅ Reviewed-by: https://github.com/trflynn89 ✅
2024-07-16 23:57:20 -06:00 · 2024-07-16 23:57:20 -06:00 · 8082daaa3f · 2024-07-18 23:46:20 +09:00
commit 8082daaa3f
parent 349a3ceec5
2 changed files with 2 additions and 12 deletions
--- a/Userland/Libraries/LibAudio/PlaybackStreamAudioUnit.cpp
+++ b/Userland/Libraries/LibAudio/PlaybackStreamAudioUnit.cpp
@ -11,12 +11,7 @@
 #include <LibCore/SharedCircularQueue.h>
 #include <LibCore/ThreadedPromise.h>

-// Several AK types conflict with MacOS types.
-#define FixedPoint FixedPointMacOS
-#define Duration DurationMacOS
 #include <AudioUnit/AudioUnit.h>
-#undef FixedPoint
-#undef Duration

 namespace Audio {

--- a/Userland/Libraries/LibCore/FileWatcherMacOS.mm
+++ b/Userland/Libraries/LibCore/FileWatcherMacOS.mm
@ -18,13 +18,8 @@
 static_assert(false, "This file must only be used for macOS");
 #endif

-// Several AK types conflict with MacOS types.
-#define FixedPoint FixedPointMacOS
-#define Duration DurationMacOS
-#include <CoreServices/CoreServices.h>
-#include <dispatch/dispatch.h>
-#undef FixedPoint
-#undef Duration
+#import <CoreServices/CoreServices.h>
+#import <dispatch/dispatch.h>

 namespace Core {