Diff
Modified: trunk/Source/WTF/ChangeLog (254416 => 254417)
--- trunk/Source/WTF/ChangeLog 2020-01-12 22:42:53 UTC (rev 254416)
+++ trunk/Source/WTF/ChangeLog 2020-01-13 00:21:42 UTC (rev 254417)
@@ -1,3 +1,18 @@
+2020-01-12 Sam Weinig <[email protected]>
+
+ Platform.h is out of control Part 2: Split WTF_OS_* macro definitions out of Platform.h and into a new OS.h
+ https://bugs.webkit.org/show_bug.cgi?id=206138
+
+ Reviewed by Anders Carlsson.
+
+ As a another step towards cleaning up Platform.h, split out OS related
+ macros into their own file.
+
+ * WTF.xcodeproj/project.pbxproj:
+ * wtf/CMakeLists.txt:
+ * wtf/OS.h: Copied from Source/WTF/wtf/Platform.h.
+ * wtf/Platform.h:
+
2020-01-11 Myles C. Maxfield <[email protected]>
REGRESSION(r185816): In the Hong Kong locale, navigator.language reports it's in the Taiwan locale
Modified: trunk/Source/WTF/WTF.xcodeproj/project.pbxproj (254416 => 254417)
--- trunk/Source/WTF/WTF.xcodeproj/project.pbxproj 2020-01-12 22:42:53 UTC (rev 254416)
+++ trunk/Source/WTF/WTF.xcodeproj/project.pbxproj 2020-01-13 00:21:42 UTC (rev 254417)
@@ -444,6 +444,7 @@
7C137942222326D500D7A824 /* ieee.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ieee.h; sourceTree = "<group>"; };
7C137943222326D500D7A824 /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
7C3F72391D78811900674E26 /* Brigand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Brigand.h; sourceTree = "<group>"; };
+ 7C8B633023CAC76D00BB4620 /* OS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OS.h; sourceTree = "<group>"; };
7C9692941F66306E00267A9E /* KeyValuePair.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KeyValuePair.h; sourceTree = "<group>"; };
7CA842E923C98CB700514CAF /* CPU.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPU.h; sourceTree = "<group>"; };
7CBBA07319BB7FDC00BBF025 /* OSObjectPtr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OSObjectPtr.h; sourceTree = "<group>"; };
@@ -1106,6 +1107,7 @@
1A4656181C7FC68E00F5920F /* OptionSet.h */,
275DFB6B238BDF72001230E2 /* OptionSetHash.h */,
0F9495831C571CC900413A48 /* OrderMaker.h */,
+ 7C8B633023CAC76D00BB4620 /* OS.h */,
A8A472D7151A825B004123FF /* OSAllocator.h */,
7CBBA07319BB7FDC00BBF025 /* OSObjectPtr.h */,
A8A472DA151A825B004123FF /* OSRandomSource.cpp */,
Modified: trunk/Source/WTF/wtf/CMakeLists.txt (254416 => 254417)
--- trunk/Source/WTF/wtf/CMakeLists.txt 2020-01-12 22:42:53 UTC (rev 254416)
+++ trunk/Source/WTF/wtf/CMakeLists.txt 2020-01-13 00:21:42 UTC (rev 254417)
@@ -149,6 +149,7 @@
Nonmovable.h
NotFound.h
NumberOfCores.h
+ OS.h
OSAllocator.h
OSObjectPtr.h
OSRandomSource.h
Copied: trunk/Source/WTF/wtf/OS.h (from rev 254414, trunk/Source/WTF/wtf/Platform.h) (0 => 254417)
--- trunk/Source/WTF/wtf/OS.h (rev 0)
+++ trunk/Source/WTF/wtf/OS.h 2020-01-13 00:21:42 UTC (rev 254417)
@@ -0,0 +1,129 @@
+/*
+ * Copyright (C) 2006-2019 Apple Inc. All rights reserved.
+ * Copyright (C) 2007-2009 Torch Mobile, Inc.
+ * Copyright (C) 2010, 2011 Research In Motion Limited. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#pragma once
+
+/* Include compiler specific macros */
+#include <wtf/Compiler.h>
+
+#if defined(__APPLE__)
+#include <Availability.h>
+#include <AvailabilityMacros.h>
+#include <TargetConditionals.h>
+#endif
+
+
+/* OS() - underlying operating system; only to be used for mandated low-level services like
+ virtual memory, not to choose a GUI toolkit */
+#define OS(WTF_FEATURE) (defined WTF_OS_##WTF_FEATURE && WTF_OS_##WTF_FEATURE)
+
+
+/* ==== OS() - underlying operating system; only to be used for mandated low-level services like
+ virtual memory, not to choose a GUI toolkit ==== */
+
+/* OS(AIX) - AIX */
+#if defined(_AIX)
+#define WTF_OS_AIX 1
+#endif
+
+/* OS(DARWIN) - Any Darwin-based OS, including macOS, iOS, macCatalyst, tvOS, and watchOS */
+#if defined(__APPLE__)
+#define WTF_OS_DARWIN 1
+#endif
+
+/* OS(IOS_FAMILY) - iOS family, including iOS, macCatalyst, tvOS, watchOS */
+#if OS(DARWIN) && TARGET_OS_IPHONE
+#define WTF_OS_IOS_FAMILY 1
+#endif
+
+/* OS(IOS) - iOS only, not including macCatalyst */
+#if OS(DARWIN) && (TARGET_OS_IOS && !(defined(TARGET_OS_MACCATALYST) && TARGET_OS_MACCATALYST))
+#define WTF_OS_IOS 1
+#endif
+
+/* FIXME: Rename this to drop the X, as that is no longer the name of the operating system. */
+/* OS(MAC_OS_X) - macOS (not including iOS family) */
+#if OS(DARWIN) && TARGET_OS_OSX
+#define WTF_OS_MAC_OS_X 1
+#endif
+
+/* OS(FREEBSD) - FreeBSD */
+#if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__)
+#define WTF_OS_FREEBSD 1
+#endif
+
+/* OS(FUCHSIA) - Fuchsia */
+#if defined(__Fuchsia__)
+#define WTF_OS_FUCHSIA 1
+#endif
+
+/* OS(HURD) - GNU/Hurd */
+#if defined(__GNU__)
+#define WTF_OS_HURD 1
+#endif
+
+/* OS(LINUX) - Linux */
+#if defined(__linux__)
+#define WTF_OS_LINUX 1
+#endif
+
+/* OS(NETBSD) - NetBSD */
+#if defined(__NetBSD__)
+#define WTF_OS_NETBSD 1
+#endif
+
+/* OS(OPENBSD) - OpenBSD */
+#if defined(__OpenBSD__)
+#define WTF_OS_OPENBSD 1
+#endif
+
+/* OS(WINDOWS) - Any version of Windows */
+#if defined(WIN32) || defined(_WIN32)
+#define WTF_OS_WINDOWS 1
+#endif
+
+
+/* OS(UNIX) - Any Unix-like system */
+#if OS(AIX) \
+ || OS(DARWIN) \
+ || OS(FREEBSD) \
+ || OS(FUCHSIA) \
+ || OS(HURD) \
+ || OS(LINUX) \
+ || OS(NETBSD) \
+ || OS(OPENBSD) \
+ || defined(unix) \
+ || defined(__unix) \
+ || defined(__unix__)
+#define WTF_OS_UNIX 1
+#endif
+
+
+/* Asserts, invariants for macro definitions */
+
+#define WTF_OS_WIN ERROR "USE WINDOWS WITH OS NOT WIN"
+#define WTF_OS_MAC ERROR "USE MAC_OS_X WITH OS NOT MAC"
Modified: trunk/Source/WTF/wtf/Platform.h (254416 => 254417)
--- trunk/Source/WTF/wtf/Platform.h 2020-01-12 22:42:53 UTC (rev 254416)
+++ trunk/Source/WTF/wtf/Platform.h 2020-01-13 00:21:42 UTC (rev 254417)
@@ -33,6 +33,9 @@
/* Include CPU specific macros */
#include <wtf/CPU.h>
+/* Include underlying operating system specific macros */
+#include <wtf/OS.h>
+
/* ==== PLATFORM handles OS, operating environment, graphics API, and
CPU. This macro will be phased out in favor of platform adaptation
macros, policy decision macros, and top-level port definitions. ==== */
@@ -41,13 +44,8 @@
/* ==== Platform adaptation macros: these describe properties of the target environment. ==== */
-/* CPU() - the target CPU architecture */
-#define CPU(WTF_FEATURE) (defined WTF_CPU_##WTF_FEATURE && WTF_CPU_##WTF_FEATURE)
/* HAVE() - specific system features (headers, functions or similar) that are present or not */
#define HAVE(WTF_FEATURE) (defined HAVE_##WTF_FEATURE && HAVE_##WTF_FEATURE)
-/* OS() - underlying operating system; only to be used for mandated low-level services like
- virtual memory, not to choose a GUI toolkit */
-#define OS(WTF_FEATURE) (defined WTF_OS_##WTF_FEATURE && WTF_OS_##WTF_FEATURE)
/* ==== Policy decision macros: these define policy choices for a particular port. ==== */
@@ -85,90 +83,6 @@
-/* ==== OS() - underlying operating system; only to be used for mandated low-level services like
- virtual memory, not to choose a GUI toolkit ==== */
-
-/* OS(AIX) - AIX */
-#ifdef _AIX
-#define WTF_OS_AIX 1
-#endif
-
-/* OS(DARWIN) - Any Darwin-based OS, including Mac OS X and iPhone OS */
-#ifdef __APPLE__
-#define WTF_OS_DARWIN 1
-
-#include <Availability.h>
-#include <AvailabilityMacros.h>
-#include <TargetConditionals.h>
-#endif
-
-/* OS(IOS_FAMILY) - iOS family, including iOS, macCatalyst, tvOS, watchOS */
-/* OS(IOS) - iOS only, not including macCatalyst */
-/* OS(MAC_OS_X) - macOS (not including iOS family) */
-#if OS(DARWIN)
-#if TARGET_OS_IOS && !(defined(TARGET_OS_MACCATALYST) && TARGET_OS_MACCATALYST)
-#define WTF_OS_IOS 1
-#endif
-#if TARGET_OS_IPHONE
-#define WTF_OS_IOS_FAMILY 1
-#elif TARGET_OS_MAC
-#define WTF_OS_MAC_OS_X 1
-#endif
-#endif
-
-/* OS(FREEBSD) - FreeBSD */
-#if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__)
-#define WTF_OS_FREEBSD 1
-#endif
-
-/* OS(FUCHSIA) - Fuchsia */
-#ifdef __Fuchsia__
-#define WTF_OS_FUCHSIA 1
-#endif
-
-/* OS(HURD) - GNU/Hurd */
-#ifdef __GNU__
-#define WTF_OS_HURD 1
-#endif
-
-/* OS(LINUX) - Linux */
-#ifdef __linux__
-#define WTF_OS_LINUX 1
-#endif
-
-/* OS(NETBSD) - NetBSD */
-#if defined(__NetBSD__)
-#define WTF_OS_NETBSD 1
-#endif
-
-/* OS(OPENBSD) - OpenBSD */
-#ifdef __OpenBSD__
-#define WTF_OS_OPENBSD 1
-#endif
-
-/* OS(WINDOWS) - Any version of Windows */
-#if defined(WIN32) || defined(_WIN32)
-#define WTF_OS_WINDOWS 1
-#endif
-
-#define WTF_OS_WIN ERROR "USE WINDOWS WITH OS NOT WIN"
-#define WTF_OS_MAC ERROR "USE MAC_OS_X WITH OS NOT MAC"
-
-/* OS(UNIX) - Any Unix-like system */
-#if OS(AIX) \
- || OS(DARWIN) \
- || OS(FREEBSD) \
- || OS(FUCHSIA) \
- || OS(HURD) \
- || OS(LINUX) \
- || OS(NETBSD) \
- || OS(OPENBSD) \
- || defined(unix) \
- || defined(__unix) \
- || defined(__unix__)
-#define WTF_OS_UNIX 1
-#endif
-
/* Operating environments */
