0ct0pu5/ladybird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

LibAudio+LibCore: Remove workarounds for system header conflicts

Browse source 
This commit could possibly be cherry-picked to serenity
This commit is contained in:
Andrew Kaster 2024-07-16 23:57:20 -06:00 • committed by Sam Atkins
parent 349a3ceec5
commit 8082daaa3f
Notes: sideshowbarker 2024-07-18 23:46:20 +09:00
2 changed files with 2 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Userland/Libraries/LibAudio/PlaybackStreamAudioUnit.cpp
View file

@ -11,12 +11,7 @@
#include <LibCore/SharedCircularQueue.h> #include <LibCore/SharedCircularQueue.h>
#include <LibCore/ThreadedPromise.h> #include <LibCore/ThreadedPromise.h>
// Several AK types conflict with MacOS types.
#define FixedPoint FixedPointMacOS
#define Duration DurationMacOS
#include <AudioUnit/AudioUnit.h> #include <AudioUnit/AudioUnit.h>
#undef FixedPoint
#undef Duration
namespace Audio { namespace Audio {

9
Userland/Libraries/LibCore/FileWatcherMacOS.mm
View file

@ -18,13 +18,8 @@
static_assert(false, "This file must only be used for macOS"); static_assert(false, "This file must only be used for macOS");
#endif #endif
// Several AK types conflict with MacOS types. #import <CoreServices/CoreServices.h>
#define FixedPoint FixedPointMacOS #import <dispatch/dispatch.h>
#define Duration DurationMacOS
#include <CoreServices/CoreServices.h>
#include <dispatch/dispatch.h>
#undef FixedPoint
#undef Duration
namespace Core { namespace Core {