beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-09-29 16:21:29 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

LibCore: Remove workarounds for system header global name conflicts

Browse source
This commit is contained in:
Andrew Kaster 2024-07-16 23:58:01 -06:00 committed by Sam Atkins
parent 8082daaa3f
commit d106b6eae2
Notes: sideshowbarker 2024-07-18 23:46:17 +09:00 
Author: https://github.com/ADKaster
Commit: https://github.com/LadybirdBrowser/ladybird/commit/d106b6eae29
Pull-request: https://github.com/LadybirdBrowser/ladybird/pull/676
Reviewed-by: https://github.com/AtkinsSJ ✅
Reviewed-by: https://github.com/trflynn89 ✅
2 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Userland/Libraries/LibCore/IOSurface.cpp
View file

@ -11,11 +11,7 @@
static_assert(false, "This file must only be used for macOS"); static_assert(false, "This file must only be used for macOS");
#endif #endif
#define FixedPoint FixedPointMacOS #import <IOSurface/IOSurface.h>
#define Duration DurationMacOS
#include <IOSurface/IOSurface.h>
#undef FixedPoint
#undef Duration
namespace Core { namespace Core {

6
Userland/Libraries/LibCore/MetalContext.mm
View file

@ -7,11 +7,7 @@
#include <AK/OwnPtr.h> #include <AK/OwnPtr.h>
#include <LibCore/MetalContext.h> #include <LibCore/MetalContext.h>
#define FixedPoint FixedPointMacOS #import <Metal/Metal.h>
#define Duration DurationMacOS
#include <Metal/Metal.h>
#undef FixedPoint
#undef Duration
namespace Core { namespace Core {