diff --git a/AK/Platform.h b/AK/Platform.h index 93a2f8f1788..c9489d8e982 100644 --- a/AK/Platform.h +++ b/AK/Platform.h @@ -76,16 +76,11 @@ # define AK_OS_LINUX #endif -#if defined(__APPLE__) && defined(__MACH__) && !defined(__IOS__) +#if defined(__APPLE__) && defined(__MACH__) # define AK_OS_MACOS # define AK_OS_BSD_GENERIC #endif -#if defined(__IOS__) -# define AK_OS_IOS -# define AK_OS_BSD_GENERIC -#endif - #if defined(__FreeBSD__) # define AK_OS_BSD_GENERIC # define AK_OS_FREEBSD diff --git a/AK/StackInfo.cpp b/AK/StackInfo.cpp index 4157d6039d5..7e9b66a2ed1 100644 --- a/AK/StackInfo.cpp +++ b/AK/StackInfo.cpp @@ -12,7 +12,7 @@ #ifdef AK_OS_SERENITY # include -#elif defined(AK_OS_LINUX) || defined(AK_LIBC_GLIBC) || defined(AK_OS_MACOS) || defined(AK_OS_IOS) || defined(AK_OS_NETBSD) || defined(AK_OS_SOLARIS) || defined(AK_OS_HAIKU) +#elif defined(AK_OS_LINUX) || defined(AK_LIBC_GLIBC) || defined(AK_OS_MACOS) || defined(AK_OS_NETBSD) || defined(AK_OS_SOLARIS) || defined(AK_OS_HAIKU) # include # include #elif defined(AK_OS_FREEBSD) || defined(AK_OS_OPENBSD) @@ -55,7 +55,7 @@ StackInfo::StackInfo() VERIFY_NOT_REACHED(); } pthread_attr_destroy(&attr); -#elif defined(AK_OS_MACOS) || defined(AK_OS_IOS) +#elif defined(AK_OS_MACOS) // NOTE: !! On MacOS, pthread_get_stackaddr_np gives the TOP of the stack, not the bottom! FlatPtr top_of_stack = (FlatPtr)pthread_get_stackaddr_np(pthread_self()); m_size = (size_t)pthread_get_stacksize_np(pthread_self()); diff --git a/Ladybird/CMakeLists.txt b/Ladybird/CMakeLists.txt index a6db50683cd..1096c3f9352 100644 --- a/Ladybird/CMakeLists.txt +++ b/Ladybird/CMakeLists.txt @@ -8,10 +8,6 @@ project(ladybird include(GNUInstallDirs) -if (IOS) - set(BUILD_SHARED_LIBS OFF) -endif() - # FIXME: The rpath steps from lagom_install_rules.cmake do not produce a working binary # in the build directory on macOS. # We need to copy the libs into the build directory bundle as the install rules do. diff --git a/Meta/CMake/accelerated_graphics.cmake b/Meta/CMake/accelerated_graphics.cmake index 30f15c7d636..07e9270df85 100644 --- a/Meta/CMake/accelerated_graphics.cmake +++ b/Meta/CMake/accelerated_graphics.cmake @@ -4,7 +4,7 @@ if (NOT ENABLE_ACCELERATED_GRAPHICS OR EMSCRIPTEN) return() endif() -if (APPLE AND NOT IOS) +if (APPLE) set(HAS_ACCELERATED_GRAPHICS ON CACHE BOOL "" FORCE) set(ACCEL_GFX_LIBS "-framework OpenGL" CACHE STRING "" FORCE) else() diff --git a/Meta/Lagom/CMakeLists.txt b/Meta/Lagom/CMakeLists.txt index a85cf5d6aea..6797080e628 100644 --- a/Meta/Lagom/CMakeLists.txt +++ b/Meta/Lagom/CMakeLists.txt @@ -564,7 +564,7 @@ if (BUILD_LAGOM) add_serenity_subdirectory(Userland/Shell) - if (NOT ENABLE_FUZZERS AND NOT ENABLE_COMPILER_EXPLORER_BUILD AND NOT IOS) + if (NOT ENABLE_FUZZERS AND NOT ENABLE_COMPILER_EXPLORER_BUILD) # Lagom Services add_serenity_subdirectory(Userland/Services) diff --git a/Meta/gn/build/toolchain/BUILD.gn b/Meta/gn/build/toolchain/BUILD.gn index cbdd17f6b2c..bd146a4f271 100644 --- a/Meta/gn/build/toolchain/BUILD.gn +++ b/Meta/gn/build/toolchain/BUILD.gn @@ -65,7 +65,7 @@ template("unix_toolchain") { } tool("alink") { - if (current_os == "ios" || current_os == "mac") { + if (current_os == "mac") { command = "libtool -D -static -no_warning_for_no_symbols {{arflags}} -o {{output}} {{inputs}}" not_needed([ "ar" ]) } else { @@ -93,7 +93,7 @@ template("unix_toolchain") { outfile = "{{output_dir}}/{{target_output_name}}{{output_extension}}" rspfile = outfile + ".rsp" rspfile_content = "{{inputs}}" - if (current_os == "ios" || current_os == "mac") { + if (current_os == "mac") { command = "$ld -shared {{ldflags}} -o $outfile @\"$rspfile\" {{libs}} {{frameworks}} -Wl,-install_name,@rpath/{{target_output_name}}{{output_extension}}" default_output_extension = ".dylib" } else { @@ -113,7 +113,7 @@ template("unix_toolchain") { tool("solink_module") { outfile = "{{output_dir}}/{{target_output_name}}{{output_extension}}" - if (current_os == "ios" || current_os == "mac") { + if (current_os == "mac") { command = "$ld -shared {{ldflags}} -Wl,-flat_namespace -Wl,-undefined,suppress -o $outfile {{inputs}} {{libs}} {{frameworks}} -Wl,-install_name,@rpath/{{target_output_name}}{{output_extension}}" default_output_extension = ".dylib" } else { @@ -135,7 +135,7 @@ template("unix_toolchain") { command_launcher = "ccache" } outfile = "{{output_dir}}/{{target_output_name}}{{output_extension}}" - if (current_os == "ios" || current_os == "mac") { + if (current_os == "mac") { command = "$ld {{ldflags}} -o $outfile {{inputs}} {{libs}} {{frameworks}} -Wl,-rpath,@executable_path/../lib" } else { command = "$ld {{ldflags}} -o $outfile -Wl,--start-group {{inputs}} -Wl,--end-group -Wl,-rpath,\\\$ORIGIN/../lib {{libs}}" @@ -157,7 +157,7 @@ template("unix_toolchain") { description = "COPY {{source}} {{output}}" } - if (current_os == "ios" || current_os == "mac") { + if (current_os == "mac") { tool("copy_bundle_data") { # https://github.com/nico/hack/blob/master/notes/copydir.md _copydir = "cd {{source}} && " + diff --git a/Userland/Libraries/LibAudio/CMakeLists.txt b/Userland/Libraries/LibAudio/CMakeLists.txt index f19100d2fc8..6f50e24dd55 100644 --- a/Userland/Libraries/LibAudio/CMakeLists.txt +++ b/Userland/Libraries/LibAudio/CMakeLists.txt @@ -42,7 +42,7 @@ if (HAVE_PULSEAUDIO) target_compile_definitions(LibAudio PRIVATE HAVE_PULSEAUDIO=1) endif() -if (APPLE AND NOT IOS) +if (APPLE) target_sources(LibAudio PRIVATE PlaybackStreamAudioUnit.cpp) find_library(AUDIO_UNIT AudioUnit REQUIRED) diff --git a/Userland/Libraries/LibCompress/BrotliDictionary.cpp b/Userland/Libraries/LibCompress/BrotliDictionary.cpp index 93f245dde60..75423fd4b9a 100644 --- a/Userland/Libraries/LibCompress/BrotliDictionary.cpp +++ b/Userland/Libraries/LibCompress/BrotliDictionary.cpp @@ -9,7 +9,7 @@ // Include the 119.9 KiB of dictionary data from a binary file extern u8 const brotli_dictionary_data[]; -#if defined(AK_OS_MACOS) || defined(AK_OS_IOS) +#if defined(AK_OS_MACOS) asm(".const_data\n" ".globl _brotli_dictionary_data\n" "_brotli_dictionary_data:\n"); diff --git a/Userland/Libraries/LibCore/CMakeLists.txt b/Userland/Libraries/LibCore/CMakeLists.txt index 795f1c5de85..1a69495b164 100644 --- a/Userland/Libraries/LibCore/CMakeLists.txt +++ b/Userland/Libraries/LibCore/CMakeLists.txt @@ -88,7 +88,7 @@ elseif (LINUX AND NOT EMSCRIPTEN) FileWatcherLinux.cpp Platform/ProcessStatisticsLinux.cpp ) -elseif (APPLE AND NOT IOS) +elseif (APPLE) list(APPEND SOURCES FileWatcherMacOS.mm Platform/ProcessStatisticsMach.cpp diff --git a/Userland/Libraries/LibCore/Environment.cpp b/Userland/Libraries/LibCore/Environment.cpp index 343273e747e..b5c34731696 100644 --- a/Userland/Libraries/LibCore/Environment.cpp +++ b/Userland/Libraries/LibCore/Environment.cpp @@ -10,7 +10,7 @@ #include "Environment.h" #include -#if defined(AK_OS_MACOS) || defined(AK_OS_IOS) +#if defined(AK_OS_MACOS) # include #else extern "C" char** environ; @@ -20,7 +20,7 @@ namespace Core::Environment { char** raw_environ() { -#if defined(AK_OS_MACOS) || defined(AK_OS_IOS) +#if defined(AK_OS_MACOS) return *_NSGetEnviron(); #else return environ; diff --git a/Userland/Libraries/LibCore/LocalServer.cpp b/Userland/Libraries/LibCore/LocalServer.cpp index 543ee3bf30b..3ffbe3198ab 100644 --- a/Userland/Libraries/LibCore/LocalServer.cpp +++ b/Userland/Libraries/LibCore/LocalServer.cpp @@ -92,7 +92,7 @@ bool LocalServer::listen(ByteString const& address) fcntl(m_fd, F_SETFD, FD_CLOEXEC); #endif VERIFY(m_fd >= 0); -#if !defined(AK_OS_MACOS) && !defined(AK_OS_IOS) +#if !defined(AK_OS_MACOS) rc = fchmod(m_fd, 0600); if (rc < 0) { perror("fchmod"); @@ -129,7 +129,7 @@ ErrorOr> LocalServer::accept() VERIFY(m_listening); sockaddr_un un; socklen_t un_size = sizeof(un); -#if !defined(AK_OS_MACOS) && !defined(AK_OS_IOS) && !defined(AK_OS_HAIKU) +#if !defined(AK_OS_MACOS) && !defined(AK_OS_HAIKU) int accepted_fd = ::accept4(m_fd, (sockaddr*)&un, &un_size, SOCK_NONBLOCK | SOCK_CLOEXEC); #else int accepted_fd = ::accept(m_fd, (sockaddr*)&un, &un_size); @@ -138,7 +138,7 @@ ErrorOr> LocalServer::accept() return Error::from_syscall("accept"sv, -errno); } -#if defined(AK_OS_MACOS) || defined(AK_OS_IOS) || defined(AK_OS_HAIKU) +#if defined(AK_OS_MACOS) || defined(AK_OS_HAIKU) int option = 1; ioctl(m_fd, FIONBIO, &option); (void)fcntl(accepted_fd, F_SETFD, FD_CLOEXEC); diff --git a/Userland/Libraries/LibCore/MachPort.h b/Userland/Libraries/LibCore/MachPort.h index b6911b4aa9c..1bc2ecf0fed 100644 --- a/Userland/Libraries/LibCore/MachPort.h +++ b/Userland/Libraries/LibCore/MachPort.h @@ -15,7 +15,7 @@ #include #include -#if defined(AK_OS_MACOS) || defined(AK_OS_IOS) +#if defined(AK_OS_MACOS) # include #else extern "C" { diff --git a/Userland/Libraries/LibCore/Socket.cpp b/Userland/Libraries/LibCore/Socket.cpp index b12c4c46102..f34f0059bf2 100644 --- a/Userland/Libraries/LibCore/Socket.cpp +++ b/Userland/Libraries/LibCore/Socket.cpp @@ -446,7 +446,7 @@ ErrorOr LocalSocket::receive_message(AK::Bytes buffer, int flags, Vector< ErrorOr LocalSocket::peer_pid() const { -#if defined(AK_OS_MACOS) || defined(AK_OS_IOS) +#if defined(AK_OS_MACOS) pid_t pid; socklen_t pid_size = sizeof(pid); #elif defined(AK_OS_FREEBSD) @@ -468,7 +468,7 @@ ErrorOr LocalSocket::peer_pid() const socklen_t creds_size = sizeof(creds); #endif -#if defined(AK_OS_MACOS) || defined(AK_OS_IOS) +#if defined(AK_OS_MACOS) TRY(System::getsockopt(m_helper.fd(), SOL_LOCAL, LOCAL_PEERPID, &pid, &pid_size)); return pid; #elif defined(AK_OS_FREEBSD) diff --git a/Userland/Libraries/LibCore/System.cpp b/Userland/Libraries/LibCore/System.cpp index 4a297c9ffc9..a1565fc22c5 100644 --- a/Userland/Libraries/LibCore/System.cpp +++ b/Userland/Libraries/LibCore/System.cpp @@ -48,7 +48,7 @@ static int memfd_create(char const* name, unsigned int flags) } #endif -#if defined(AK_OS_MACOS) || defined(AK_OS_IOS) +#if defined(AK_OS_MACOS) # include # include #else @@ -141,7 +141,7 @@ static ErrorOr> getgrent_impl(Span buffer) namespace Core::System { #ifndef HOST_NAME_MAX -# if defined(AK_OS_MACOS) || defined(AK_OS_IOS) +# if defined(AK_OS_MACOS) # define HOST_NAME_MAX 255 # else # define HOST_NAME_MAX 64 @@ -428,7 +428,7 @@ ErrorOr> getspnam(StringView name) } #endif -#if !defined(AK_OS_MACOS) && !defined(AK_OS_IOS) && !defined(AK_OS_HAIKU) +#if !defined(AK_OS_MACOS) && !defined(AK_OS_HAIKU) ErrorOr accept4(int sockfd, sockaddr* address, socklen_t* address_length, int flags) { auto fd = ::accept4(sockfd, address, address_length, flags); @@ -933,19 +933,17 @@ ErrorOr> getgrnam(StringView name) return Optional {}; } -#if !defined(AK_OS_IOS) ErrorOr clock_settime(clockid_t clock_id, struct timespec* ts) { -# ifdef AK_OS_SERENITY +#ifdef AK_OS_SERENITY int rc = syscall(SC_clock_settime, clock_id, ts); HANDLE_SYSCALL_RETURN_VALUE("clocksettime", rc, {}); -# else +#else if (::clock_settime(clock_id, ts) < 0) return Error::from_syscall("clocksettime"sv, -errno); return {}; -# endif -} #endif +} static ALWAYS_INLINE ErrorOr posix_spawn_wrapper(StringView path, posix_spawn_file_actions_t const* file_actions, posix_spawnattr_t const* attr, char* const arguments[], char* const envp[], StringView function_name, decltype(::posix_spawn) spawn_function) { @@ -1431,7 +1429,7 @@ ErrorOr exec(StringView filename, ReadonlySpan arguments, Sear envp[environment->size()] = nullptr; if (search_in_path == SearchInPath::Yes && !filename.contains('/')) { -# if defined(AK_OS_MACOS) || defined(AK_OS_IOS) || defined(AK_OS_FREEBSD) || defined(AK_OS_SOLARIS) +# if defined(AK_OS_MACOS) || defined(AK_OS_FREEBSD) || defined(AK_OS_SOLARIS) // These BSDs don't support execvpe(), so we'll have to manually search the PATH. ScopedValueRollback errno_rollback(errno); @@ -1867,7 +1865,7 @@ ErrorOr current_executable_path() size_t len = sizeof(path); if (sysctl(mib, 4, path, &len, nullptr, 0) < 0) return Error::from_syscall("sysctl"sv, -errno); -#elif defined(AK_OS_MACOS) || defined(AK_OS_IOS) +#elif defined(AK_OS_MACOS) u32 size = sizeof(path); auto ret = _NSGetExecutablePath(path, &size); if (ret != 0) diff --git a/Userland/Libraries/LibCore/System.h b/Userland/Libraries/LibCore/System.h index 42dd0eadd91..eeeff8a6799 100644 --- a/Userland/Libraries/LibCore/System.h +++ b/Userland/Libraries/LibCore/System.h @@ -157,9 +157,7 @@ ErrorOr> getpwuid(uid_t); ErrorOr> getgrent(Span buffer); ErrorOr> getgrgid(gid_t); -#if !defined(AK_OS_IOS) ErrorOr clock_settime(clockid_t clock_id, struct timespec* ts); -#endif ErrorOr posix_spawn(StringView path, posix_spawn_file_actions_t const* file_actions, posix_spawnattr_t const* attr, char* const arguments[], char* const envp[]); ErrorOr posix_spawnp(StringView path, posix_spawn_file_actions_t* const file_actions, posix_spawnattr_t* const attr, char* const arguments[], char* const envp[]); diff --git a/Userland/Libraries/LibCore/TCPServer.cpp b/Userland/Libraries/LibCore/TCPServer.cpp index cb4ffe4d9da..4835a61fa72 100644 --- a/Userland/Libraries/LibCore/TCPServer.cpp +++ b/Userland/Libraries/LibCore/TCPServer.cpp @@ -80,7 +80,7 @@ ErrorOr> TCPServer::accept() VERIFY(m_listening); sockaddr_in in; socklen_t in_size = sizeof(in); -#if !defined(AK_OS_MACOS) && !defined(AK_OS_IOS) && !defined(AK_OS_HAIKU) +#if !defined(AK_OS_MACOS) && !defined(AK_OS_HAIKU) int accepted_fd = TRY(Core::System::accept4(m_fd, (sockaddr*)&in, &in_size, SOCK_NONBLOCK | SOCK_CLOEXEC)); #else int accepted_fd = TRY(Core::System::accept(m_fd, (sockaddr*)&in, &in_size)); @@ -88,7 +88,7 @@ ErrorOr> TCPServer::accept() auto socket = TRY(TCPSocket::adopt_fd(accepted_fd)); -#if defined(AK_OS_MACOS) || defined(AK_OS_IOS) || defined(AK_OS_HAIKU) +#if defined(AK_OS_MACOS) || defined(AK_OS_HAIKU) // FIXME: Ideally, we should let the caller decide whether it wants the // socket to be nonblocking or not, but there are currently places // which depend on this. diff --git a/Userland/Libraries/LibFileSystem/FileSystem.cpp b/Userland/Libraries/LibFileSystem/FileSystem.cpp index b8ad718f075..41bfb351e90 100644 --- a/Userland/Libraries/LibFileSystem/FileSystem.cpp +++ b/Userland/Libraries/LibFileSystem/FileSystem.cpp @@ -14,7 +14,7 @@ #if defined(AK_OS_SERENITY) # include -#elif !defined(AK_OS_IOS) && defined(AK_OS_BSD_GENERIC) +#elif defined(AK_OS_BSD_GENERIC) # include #elif defined(AK_OS_LINUX) # include @@ -231,7 +231,7 @@ ErrorOr copy_file(StringView destination_path, StringView source_path, str if (has_flag(preserve_mode, PreserveMode::Timestamps)) { struct timespec times[2] = { -#if defined(AK_OS_MACOS) || defined(AK_OS_IOS) +#if defined(AK_OS_MACOS) source_stat.st_atimespec, source_stat.st_mtimespec, #else @@ -283,7 +283,7 @@ ErrorOr copy_directory(StringView destination_path, StringView source_path if (has_flag(preserve_mode, PreserveMode::Timestamps)) { struct timespec times[2] = { -#if defined(AK_OS_MACOS) || defined(AK_OS_IOS) +#if defined(AK_OS_MACOS) source_stat.st_atimespec, source_stat.st_mtimespec, #else diff --git a/Userland/Libraries/LibWeb/Loader/UserAgent.h b/Userland/Libraries/LibWeb/Loader/UserAgent.h index 17d1587cbdb..adaa917053d 100644 --- a/Userland/Libraries/LibWeb/Loader/UserAgent.h +++ b/Userland/Libraries/LibWeb/Loader/UserAgent.h @@ -30,8 +30,6 @@ namespace Web { # define OS_STRING "Linux" #elif defined(AK_OS_MACOS) # define OS_STRING "macOS" -#elif defined(AK_OS_IOS) -# define OS_STRING "iOS" #elif defined(AK_OS_WINDOWS) # define OS_STRING "Windows" #elif defined(AK_OS_FREEBSD)