mirror of
https://github.com/LadybirdBrowser/ladybird.git
synced 2025-04-21 12:05:15 +00:00
Merge 0de1dba686
into 8e37cd2f71
This commit is contained in:
commit
fd059c80b9
4 changed files with 4 additions and 8 deletions
|
@ -10,9 +10,7 @@
|
|||
#ifdef AK_OS_WINDOWS
|
||||
# include <AK/ByteString.h>
|
||||
# include <AK/HashMap.h>
|
||||
# include <windows.h>
|
||||
// Comment to prevent clang-format from including windows.h too late
|
||||
# include <winbase.h>
|
||||
# include <AK/Windows.h>
|
||||
#endif
|
||||
|
||||
namespace AK {
|
||||
|
|
|
@ -19,9 +19,7 @@
|
|||
# include <pthread.h>
|
||||
# include <pthread_np.h>
|
||||
#elif defined(AK_OS_WINDOWS)
|
||||
# include <Windows.h>
|
||||
// NOTE: Prevent clang-format from re-ordering this header order
|
||||
# include <Processthreadsapi.h>
|
||||
# include <AK/Windows.h>
|
||||
#endif
|
||||
|
||||
namespace AK {
|
||||
|
|
|
@ -10,8 +10,8 @@
|
|||
|
||||
#include <AK/String.h>
|
||||
#include <AK/Utf16View.h>
|
||||
#include <AK/Windows.h>
|
||||
#include <LibCore/Process.h>
|
||||
#include <windows.h>
|
||||
|
||||
namespace Core {
|
||||
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
#elif defined(AK_OS_LINUX)
|
||||
# include <linux/fs.h>
|
||||
#elif defined(AK_OS_WINDOWS)
|
||||
# include <windows.h>
|
||||
# include <AK/Windows.h>
|
||||
#endif
|
||||
|
||||
// On Linux distros that use glibc `basename` is defined as a macro that expands to `__xpg_basename`, so we undefine it
|
||||
|
|
Loading…
Add table
Reference in a new issue