소스 검색

LibAudio+LibCore: Remove workarounds for system header conflicts

This commit could possibly be cherry-picked to serenity
Andrew Kaster 1 년 전
부모
커밋
8082daaa3f
2개의 변경된 파일2개의 추가작업 그리고 12개의 파일을 삭제
  1. 0 5
      Userland/Libraries/LibAudio/PlaybackStreamAudioUnit.cpp
  2. 2 7
      Userland/Libraries/LibCore/FileWatcherMacOS.mm

+ 0 - 5
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 {
 

+ 2 - 7
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 {