From 8f38367d46f51e9b93b2a052ea8fec94b9c62721 Mon Sep 17 00:00:00 2001 From: Andrew Kaster Date: Thu, 22 Sep 2022 07:46:01 -0600 Subject: [PATCH] LibCore: Only include Account.h on Serenity in EventLoop and System Core::Acount is only used within ``#ifdef __serenity__`` blocks in these files, so guard the inclusion of Account.h in the same way. This fixes the Android build of these files. --- Userland/Libraries/LibCore/EventLoop.cpp | 3 ++- Userland/Libraries/LibCore/System.cpp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Userland/Libraries/LibCore/EventLoop.cpp b/Userland/Libraries/LibCore/EventLoop.cpp index 8258c78e9d..a7f7198622 100644 --- a/Userland/Libraries/LibCore/EventLoop.cpp +++ b/Userland/Libraries/LibCore/EventLoop.cpp @@ -17,7 +17,6 @@ #include #include #include -#include #include #include #include @@ -37,6 +36,8 @@ #include #ifdef __serenity__ +# include + extern bool s_global_initializers_ran; #endif diff --git a/Userland/Libraries/LibCore/System.cpp b/Userland/Libraries/LibCore/System.cpp index 5497a1bff1..a23e76900a 100644 --- a/Userland/Libraries/LibCore/System.cpp +++ b/Userland/Libraries/LibCore/System.cpp @@ -12,7 +12,6 @@ #include #include #include -#include #include #include #include @@ -26,6 +25,7 @@ #include #ifdef __serenity__ +# include # include # include #endif