wtf/Process.h is conflicting with process.h on Windows

https://bugs.webkit.org/show_bug.cgi?id=255214 Reviewed by Ross Kirsling. After 262760@main (bug#255199) added wtf/Process.h, Windows port can't compile. > ThreadingWin.cpp(158): error C3861: '_beginthreadex': identifier not found Windows has process.h. Renamed Process.h to WTFProcess.h. * Source/JavaScriptCore/API/tests/ExecutionTimeLimitTest.cpp: * Source/JavaScriptCore/API/tests/testapi.mm: * Source/JavaScriptCore/assembler/testmasm.cpp: * Source/JavaScriptCore/b3/air/testair.cpp: * Source/JavaScriptCore/b3/testb3.h: * Source/JavaScriptCore/dfg/testdfg.cpp: * Source/JavaScriptCore/jsc.cpp: * Source/JavaScriptCore/runtime/ResourceExhaustion.cpp: * Source/JavaScriptCore/testRegExp.cpp: * Source/JavaScriptCore/tools/FunctionOverrides.cpp: * Source/JavaScriptCore/tools/JSDollarVM.cpp: * Source/WTF/WTF.xcodeproj/project.pbxproj: * Source/WTF/wtf/CMakeLists.txt: * Source/WTF/wtf/WTFProcess.cpp: Renamed from Source/WTF/wtf/Process.cpp. * Source/WTF/wtf/WTFProcess.h: Renamed from Source/WTF/wtf/Process.h. * Source/WebCore/workers/service/context/SWContextManager.cpp: * Source/WebGPU/WGSL/wgslc.cpp: * Source/WebKit/NetworkProcess/NetworkProcess.cpp: * Source/WebKit/Platform/IPC/Connection.cpp: * Source/WebKit/Shared/AuxiliaryProcess.cpp: * Source/WebKit/Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceEntryPoint.h: * Source/WebKit/Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceEntryPoint.mm: * Source/WebKit/Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceMain.mm: * Source/WebKit/Shared/IPCStreamTester.cpp: * Source/WebKit/Shared/mac/AuxiliaryProcessMac.mm: * Source/WebKit/WebProcess/WebProcess.cpp: * Source/WebKit/webpushd/WebPushDaemonMain.mm: * Source/WebKit/webpushd/webpushtool/WebPushToolMain.mm: * Tools/DumpRenderTree/mac/DumpRenderTree.mm: * Tools/WebKitTestRunner/TestController.cpp: * Tools/WebKitTestRunner/gtk/TestControllerGtk.cpp: * Tools/WebKitTestRunner/win/TestControllerWin.cpp: * Tools/WebKitTestRunner/wpe/TestControllerWPE.cpp: Canonical link: https://commits.webkit.org/262762@main
WebKit · Apr 10, 2023 · f0c7ad4 · f0c7ad4
1 parent cc0701a
commit f0c7ad4
Show file tree

Hide file tree

Showing 33 changed files with 40 additions and 40 deletions.
diff --git a/Source/JavaScriptCore/API/tests/ExecutionTimeLimitTest.cpp b/Source/JavaScriptCore/API/tests/ExecutionTimeLimitTest.cpp
@@ -33,8 +33,8 @@
 #include <wtf/CPUTime.h>
 #include <wtf/Condition.h>
 #include <wtf/Lock.h>
-#include <wtf/Process.h>
 #include <wtf/Threading.h>
+#include <wtf/WTFProcess.h>
 #include <wtf/text/StringBuilder.h>
 
 #if HAVE(MACH_EXCEPTIONS)

diff --git a/Source/JavaScriptCore/API/tests/testapi.mm b/Source/JavaScriptCore/API/tests/testapi.mm
@@ -39,8 +39,8 @@
 #import "JSWrapperMapTests.h"
 #import "Regress141275.h"
 #import "Regress141809.h"
-#import <wtf/Process.h>
 #import <wtf/SafeStrerror.h>
+#import <wtf/WTFProcess.h>
 #import <wtf/spi/darwin/DataVaultSPI.h>
 
 

diff --git a/Source/JavaScriptCore/assembler/testmasm.cpp b/Source/JavaScriptCore/assembler/testmasm.cpp
@@ -39,9 +39,9 @@
 #include <wtf/Function.h>
 #include <wtf/Lock.h>
 #include <wtf/NumberOfCores.h>
-#include <wtf/Process.h>
 #include <wtf/PtrTag.h>
 #include <wtf/Threading.h>
+#include <wtf/WTFProcess.h>
 #include <wtf/text/StringCommon.h>
 
 // We don't have a NO_RETURN_DUE_TO_EXIT, nor should we. That's ridiculous.

diff --git a/Source/JavaScriptCore/b3/air/testair.cpp b/Source/JavaScriptCore/b3/air/testair.cpp
@@ -45,9 +45,9 @@
 #include <wtf/DataLog.h>
 #include <wtf/Lock.h>
 #include <wtf/NumberOfCores.h>
-#include <wtf/Process.h>
 #include <wtf/StdMap.h>
 #include <wtf/Threading.h>
+#include <wtf/WTFProcess.h>
 #include <wtf/text/StringCommon.h>
 
 // We don't have a NO_RETURN_DUE_TO_EXIT, nor should we. That's ridiculous.

diff --git a/Source/JavaScriptCore/b3/testb3.h b/Source/JavaScriptCore/b3/testb3.h
@@ -77,9 +77,9 @@
 #include <wtf/ListDump.h>
 #include <wtf/Lock.h>
 #include <wtf/NumberOfCores.h>
-#include <wtf/Process.h>
 #include <wtf/StdList.h>
 #include <wtf/Threading.h>
+#include <wtf/WTFProcess.h>
 #include <wtf/text/StringCommon.h>
 
 // We don't have a NO_RETURN_DUE_TO_EXIT, nor should we. That's ridiculous.

diff --git a/Source/JavaScriptCore/dfg/testdfg.cpp b/Source/JavaScriptCore/dfg/testdfg.cpp
@@ -30,7 +30,7 @@
 #include "DFGAbstractValue.h"
 #include "InitializeThreading.h"
 #include <wtf/DataLog.h>
-#include <wtf/Process.h>
+#include <wtf/WTFProcess.h>
 #include <wtf/text/StringCommon.h>
 
 // We don't have a NO_RETURN_DUE_TO_EXIT, nor should we. That's ridiculous.

diff --git a/Source/JavaScriptCore/jsc.cpp b/Source/JavaScriptCore/jsc.cpp
@@ -92,12 +92,12 @@
 #include <wtf/MainThread.h>
 #include <wtf/MemoryPressureHandler.h>
 #include <wtf/MonotonicTime.h>
-#include <wtf/Process.h>
 #include <wtf/SafeStrerror.h>
 #include <wtf/Scope.h>
 #include <wtf/Span.h>
 #include <wtf/StringPrintStream.h>
 #include <wtf/URL.h>
+#include <wtf/WTFProcess.h>
 #include <wtf/WallTime.h>
 #include <wtf/text/Base64.h>
 #include <wtf/text/StringBuilder.h>

diff --git a/Source/JavaScriptCore/runtime/ResourceExhaustion.cpp b/Source/JavaScriptCore/runtime/ResourceExhaustion.cpp
@@ -28,7 +28,7 @@
 
 #include "Options.h"
 #include <wtf/Assertions.h>
-#include <wtf/Process.h>
+#include <wtf/WTFProcess.h>
 
 namespace JSC {
 

diff --git a/Source/JavaScriptCore/testRegExp.cpp b/Source/JavaScriptCore/testRegExp.cpp
@@ -28,8 +28,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <wtf/Process.h>
 #include <wtf/Vector.h>
+#include <wtf/WTFProcess.h>
 #include <wtf/text/StringBuilder.h>
 
 #if COMPILER(MSVC)

diff --git a/Source/JavaScriptCore/tools/FunctionOverrides.cpp b/Source/JavaScriptCore/tools/FunctionOverrides.cpp
@@ -31,8 +31,8 @@
 #include <string.h>
 #include <wtf/DataLog.h>
 #include <wtf/NeverDestroyed.h>
-#include <wtf/Process.h>
 #include <wtf/SafeStrerror.h>
+#include <wtf/WTFProcess.h>
 #include <wtf/text/CString.h>
 #include <wtf/text/StringBuilder.h>
 #include <wtf/text/StringHash.h>

diff --git a/Source/JavaScriptCore/tools/JSDollarVM.cpp b/Source/JavaScriptCore/tools/JSDollarVM.cpp
@@ -64,9 +64,9 @@
 #include <wtf/CPUTime.h>
 #include <wtf/DataLog.h>
 #include <wtf/Language.h>
-#include <wtf/Process.h>
 #include <wtf/ProcessID.h>
 #include <wtf/StringPrintStream.h>
+#include <wtf/WTFProcess.h>
 #include <wtf/unicode/icu/ICUHelpers.h>
 
 #if !USE(SYSTEM_MALLOC)

diff --git a/Source/WTF/WTF.xcodeproj/project.pbxproj b/Source/WTF/WTF.xcodeproj/project.pbxproj
@@ -815,8 +815,8 @@
 		E361DB67289115D000B2A2B8 /* fast_table.h in Headers */ = {isa = PBXBuildFile; fileRef = E361DB5E289115D000B2A2B8 /* fast_table.h */; };
 		E361DB68289115D000B2A2B8 /* digit_comparison.h in Headers */ = {isa = PBXBuildFile; fileRef = E361DB5F289115D000B2A2B8 /* digit_comparison.h */; };
 		E361DB69289115D000B2A2B8 /* bigint.h in Headers */ = {isa = PBXBuildFile; fileRef = E361DB60289115D000B2A2B8 /* bigint.h */; };
-		E36BA9DE29E275DB00300057 /* Process.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E36BA9DC29E275DB00300057 /* Process.cpp */; };
-		E36BA9DF29E275DB00300057 /* Process.h in Headers */ = {isa = PBXBuildFile; fileRef = E36BA9DD29E275DB00300057 /* Process.h */; settings = {ATTRIBUTES = (Private, ); }; };
+		E36BA9DE29E275DB00300057 /* WTFProcess.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E36BA9DC29E275DB00300057 /* WTFProcess.cpp */; };
+		E36BA9DF29E275DB00300057 /* WTFProcess.h in Headers */ = {isa = PBXBuildFile; fileRef = E36BA9DD29E275DB00300057 /* WTFProcess.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		E37E96542702AD0B00E1C36A /* ApproximateTime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E37E96522702AD0700E1C36A /* ApproximateTime.cpp */; };
 		E388886F20C9095100E632BC /* WorkerPool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E388886D20C9095100E632BC /* WorkerPool.cpp */; };
 		E38C41281EB4E0680042957D /* CPUTime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38C41261EB4E0680042957D /* CPUTime.cpp */; };
@@ -1719,8 +1719,8 @@
 		E361DB60289115D000B2A2B8 /* bigint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bigint.h; sourceTree = "<group>"; };
 		E36895CB23A445CD008DD4C8 /* PackedRef.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PackedRef.h; sourceTree = "<group>"; };
 		E36895CC23A445EE008DD4C8 /* PackedRefPtr.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PackedRefPtr.h; sourceTree = "<group>"; };
-		E36BA9DC29E275DB00300057 /* Process.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Process.cpp; sourceTree = "<group>"; };
-		E36BA9DD29E275DB00300057 /* Process.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Process.h; sourceTree = "<group>"; };
+		E36BA9DC29E275DB00300057 /* WTFProcess.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WTFProcess.cpp; sourceTree = "<group>"; };
+		E36BA9DD29E275DB00300057 /* WTFProcess.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WTFProcess.h; sourceTree = "<group>"; };
 		E37E96522702AD0700E1C36A /* ApproximateTime.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = ApproximateTime.cpp; sourceTree = "<group>"; };
 		E37E96532702AD0700E1C36A /* ApproximateTime.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ApproximateTime.h; sourceTree = "<group>"; };
 		E38020DB2401C0930037CA9E /* CompactRefPtrTuple.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CompactRefPtrTuple.h; sourceTree = "<group>"; };
@@ -2228,8 +2228,6 @@
 				0F9D335D165DBA73005AD387 /* PrintStream.cpp */,
 				0F9D335E165DBA73005AD387 /* PrintStream.h */,
 				53EC253C1E95AD30000831B9 /* PriorityQueue.h */,
-				E36BA9DC29E275DB00300057 /* Process.cpp */,
-				E36BA9DD29E275DB00300057 /* Process.h */,
 				0FC4488216FE9FE100844BE9 /* ProcessID.h */,
 				7AF023B42061E16F00A8EFD6 /* ProcessPrivilege.cpp */,
 				7AF023B32061E16C00A8EFD6 /* ProcessPrivilege.h */,
@@ -2400,6 +2398,8 @@
 				FE05FAFE1FE5007500093230 /* WTFAssertions.cpp */,
 				FE032AD02463E43B0012D7C7 /* WTFConfig.cpp */,
 				FE032AD12463E43B0012D7C7 /* WTFConfig.h */,
+				E36BA9DC29E275DB00300057 /* WTFProcess.cpp */,
+				E36BA9DD29E275DB00300057 /* WTFProcess.h */,
 				A36E16F7216FF828008DD87E /* WTFSemaphore.h */,
 			);
 			path = wtf;
@@ -3193,7 +3193,6 @@
 				DD3DC96F27A4BF8E007E5B61 /* PointerPreparations.h in Headers */,
 				DD3DC93227A4BF8E007E5B61 /* PrintStream.h in Headers */,
 				DD3DC95027A4BF8E007E5B61 /* PriorityQueue.h in Headers */,
-				E36BA9DF29E275DB00300057 /* Process.h in Headers */,
 				DD3DC89927A4BF8E007E5B61 /* ProcessID.h in Headers */,
 				DDF306E827C08654006A526F /* ProcessMemoryFootprint.h in Headers */,
 				DD3DC95627A4BF8E007E5B61 /* ProcessPrivilege.h in Headers */,
@@ -3370,6 +3369,7 @@
 				DD3DC92327A4BF8E007E5B61 /* WorkerPool.h in Headers */,
 				DD3DC88527A4BF8E007E5B61 /* WorkQueue.h in Headers */,
 				DD3DC8FF27A4BF8E007E5B61 /* WTFConfig.h in Headers */,
+				E36BA9DF29E275DB00300057 /* WTFProcess.h in Headers */,
 				DD3DC97D27A4BF8E007E5B61 /* WTFSemaphore.h in Headers */,
 				DDF307C227C086DF006A526F /* WTFString.h in Headers */,
 				DDF306EA27C08654006A526F /* XPCSPI.h in Headers */,
@@ -3756,7 +3756,6 @@
 				51F1752D1F3D486000C74950 /* PersistentEncoder.cpp in Sources */,
 				FE1E2C42224187C600F6B729 /* PlatformRegisters.cpp in Sources */,
 				0F9D3362165DBA73005AD387 /* PrintStream.cpp in Sources */,
-				E36BA9DE29E275DB00300057 /* Process.cpp in Sources */,
 				7AF023B52061E17000A8EFD6 /* ProcessPrivilege.cpp in Sources */,
 				FE1E2C3B2240C06600F6B729 /* PtrTag.cpp in Sources */,
 				143F611F1565F0F900DB514A /* RAMSize.cpp in Sources */,
@@ -3835,6 +3834,7 @@
 				E4A0AD3D1A96253C00536DF6 /* WorkQueueCocoa.cpp in Sources */,
 				FE05FAFF1FE5007500093230 /* WTFAssertions.cpp in Sources */,
 				FE032AD22463E43B0012D7C7 /* WTFConfig.cpp in Sources */,
+				E36BA9DE29E275DB00300057 /* WTFProcess.cpp in Sources */,
 				A8A47445151A825B004123FF /* WTFString.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;

diff --git a/Source/WTF/wtf/CMakeLists.txt b/Source/WTF/wtf/CMakeLists.txt
@@ -212,7 +212,6 @@ set(WTF_PUBLIC_HEADERS
     PointerPreparations.h
     PrintStream.h
     PriorityQueue.h
-    Process.h
     ProcessID.h
     ProcessPrivilege.h
     PtrTag.h
@@ -327,6 +326,7 @@ set(WTF_PUBLIC_HEADERS
     VectorHash.h
     VectorTraits.h
     WTFConfig.h
+    WTFProcess.h
     WTFSemaphore.h
     WallTime.h
     WeakHashCountedSet.h
@@ -483,7 +483,6 @@ set(WTF_SOURCES
     ParallelJobsGeneric.cpp
     ParkingLot.cpp
     PrintStream.cpp
-    Process.cpp
     ProcessPrivilege.cpp
     RAMSize.cpp
     RandomDevice.cpp
@@ -517,6 +516,7 @@ set(WTF_SOURCES
     Vector.cpp
     WTFAssertions.cpp
     WTFConfig.cpp
+    WTFProcess.cpp
     WallTime.cpp
     WeakPtr.cpp
     WeakRandomNumber.cpp

diff --git a/Source/WTF/wtf/Process.cpp → Source/WTF/wtf/WTFProcess.cpp b/Source/WTF/wtf/Process.cpp → Source/WTF/wtf/WTFProcess.cpp
@@ -24,7 +24,7 @@
  */
 
 #include "config.h"
-#include <wtf/Process.h>
+#include <wtf/WTFProcess.h>
 
 #include <stdlib.h>
 

diff --git a/Source/WTF/wtf/Process.h → Source/WTF/wtf/WTFProcess.h b/Source/WTF/wtf/Process.h → Source/WTF/wtf/WTFProcess.h
diff --git a/Source/WebCore/workers/service/context/SWContextManager.cpp b/Source/WebCore/workers/service/context/SWContextManager.cpp
@@ -31,7 +31,7 @@
 #include "Logging.h"
 #include "MessageWithMessagePorts.h"
 #include "ServiceWorkerGlobalScope.h"
-#include <wtf/Process.h>
+#include <wtf/WTFProcess.h>
 
 namespace WebCore {
 

diff --git a/Source/WebGPU/WGSL/wgslc.cpp b/Source/WebGPU/WGSL/wgslc.cpp
@@ -30,7 +30,7 @@
 #include "WGSLShaderModule.h"
 #include <wtf/DataLog.h>
 #include <wtf/FileSystem.h>
-#include <wtf/Process.h>
+#include <wtf/WTFProcess.h>
 
 static NO_RETURN void printUsageStatement(bool help = false)
 {

diff --git a/Source/WebKit/NetworkProcess/NetworkProcess.cpp b/Source/WebKit/NetworkProcess/NetworkProcess.cpp
@@ -92,11 +92,11 @@
 #include <wtf/CallbackAggregator.h>
 #include <wtf/CryptographicallyRandomNumber.h>
 #include <wtf/OptionSet.h>
-#include <wtf/Process.h>
 #include <wtf/ProcessPrivilege.h>
 #include <wtf/RunLoop.h>
 #include <wtf/UUID.h>
 #include <wtf/UniqueRef.h>
+#include <wtf/WTFProcess.h>
 #include <wtf/text/AtomString.h>
 
 #if ENABLE(SEC_ITEM_SHIM)

diff --git a/Source/WebKit/Platform/IPC/Connection.cpp b/Source/WebKit/Platform/IPC/Connection.cpp
@@ -36,9 +36,9 @@
 #include <wtf/Lock.h>
 #include <wtf/NeverDestroyed.h>
 #include <wtf/ObjectIdentifier.h>
-#include <wtf/Process.h>
 #include <wtf/RunLoop.h>
 #include <wtf/Scope.h>
+#include <wtf/WTFProcess.h>
 #include <wtf/text/WTFString.h>
 #include <wtf/threads/BinarySemaphore.h>
 

diff --git a/Source/WebKit/Shared/AuxiliaryProcess.cpp b/Source/WebKit/Shared/AuxiliaryProcess.cpp
@@ -35,8 +35,8 @@
 #include <WebCore/LogInitialization.h>
 #include <pal/SessionID.h>
 #include <wtf/LogInitialization.h>
-#include <wtf/Process.h>
 #include <wtf/SetForScope.h>
+#include <wtf/WTFProcess.h>
 
 #if !OS(WINDOWS)
 #include <unistd.h>

diff --git a/Source/WebKit/Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceEntryPoint.h b/Source/WebKit/Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceEntryPoint.h
@@ -29,7 +29,7 @@
 #import "WebKit2Initialize.h"
 #import <JavaScriptCore/ExecutableAllocator.h>
 #import <wtf/OSObjectPtr.h>
-#import <wtf/Process.h>
+#import <wtf/WTFProcess.h>
 #import <wtf/cocoa/RuntimeApplicationChecksCocoa.h>
 
 #if !USE(RUNNINGBOARD)

diff --git a/Source/WebKit/Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceEntryPoint.mm b/Source/WebKit/Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceEntryPoint.mm
@@ -30,7 +30,7 @@
 #import "XPCServiceEntryPoint.h"
 #import <WebCore/ProcessIdentifier.h>
 #import <signal.h>
-#import <wtf/Process.h>
+#import <wtf/WTFProcess.h>
 #import <wtf/cocoa/Entitlements.h>
 #import <wtf/spi/darwin/SandboxSPI.h>
 #import <wtf/text/StringToIntegerConversion.h>

diff --git a/Source/WebKit/Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceMain.mm b/Source/WebKit/Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceMain.mm
@@ -37,8 +37,8 @@
 #import <wtf/BlockPtr.h>
 #import <wtf/Language.h>
 #import <wtf/OSObjectPtr.h>
-#import <wtf/Process.h>
 #import <wtf/RetainPtr.h>
+#import <wtf/WTFProcess.h>
 #import <wtf/spi/cocoa/OSLogSPI.h>
 #import <wtf/spi/darwin/SandboxSPI.h>
 #import <wtf/spi/darwin/XPCSPI.h>

diff --git a/Source/WebKit/Shared/IPCStreamTester.cpp b/Source/WebKit/Shared/IPCStreamTester.cpp
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "IPCStreamTester.h"
 
-#include <wtf/Process.h>
+#include <wtf/WTFProcess.h>
 
 #if ENABLE(IPC_TESTING_API)
 #include "Decoder.h"

diff --git a/Source/WebKit/Shared/mac/AuxiliaryProcessMac.mm b/Source/WebKit/Shared/mac/AuxiliaryProcessMac.mm
@@ -50,11 +50,11 @@
 #import <sysexits.h>
 #import <wtf/DataLog.h>
 #import <wtf/FileSystem.h>
-#import <wtf/Process.h>
 #import <wtf/SafeStrerror.h>
 #import <wtf/Scope.h>
 #import <wtf/SoftLinking.h>
 #import <wtf/SystemTracing.h>
+#import <wtf/WTFProcess.h>
 #import <wtf/WallTime.h>
 #import <wtf/cocoa/Entitlements.h>
 #import <wtf/spi/darwin/SandboxSPI.h>

diff --git a/Source/WebKit/WebProcess/WebProcess.cpp b/Source/WebKit/WebProcess/WebProcess.cpp
@@ -149,11 +149,11 @@
 #include <wtf/CallbackAggregator.h>
 #include <wtf/DateMath.h>
 #include <wtf/Language.h>
-#include <wtf/Process.h>
 #include <wtf/ProcessPrivilege.h>
 #include <wtf/RunLoop.h>
 #include <wtf/SystemTracing.h>
 #include <wtf/URLParser.h>
+#include <wtf/WTFProcess.h>
 #include <wtf/text/StringHash.h>
 #include <wtf/text/TextStream.h>
 

diff --git a/Source/WebKit/webpushd/WebPushDaemonMain.mm b/Source/WebKit/webpushd/WebPushDaemonMain.mm
@@ -40,7 +40,7 @@
 #import <wtf/LogInitialization.h>
 #import <wtf/MainThread.h>
 #import <wtf/OSObjectPtr.h>
-#import <wtf/Process.h>
+#import <wtf/WTFProcess.h>
 #import <wtf/spi/darwin/XPCSPI.h>
 
 using WebKit::Daemon::EncodedMessage;

diff --git a/Source/WebKit/webpushd/webpushtool/WebPushToolMain.mm b/Source/WebKit/webpushd/webpushtool/WebPushToolMain.mm
@@ -29,7 +29,7 @@
 #import <Foundation/Foundation.h>
 #import <optional>
 #import <wtf/MainThread.h>
-#import <wtf/Process.h>
+#import <wtf/WTFProcess.h>
 
 using WebKit::WebPushD::PushMessageForTesting;
 

diff --git a/Tools/DumpRenderTree/mac/DumpRenderTree.mm b/Tools/DumpRenderTree/mac/DumpRenderTree.mm
@@ -98,11 +98,11 @@
 #import <wtf/FastMalloc.h>
 #import <wtf/NeverDestroyed.h>
 #import <wtf/OSObjectPtr.h>
-#import <wtf/Process.h>
 #import <wtf/ProcessPrivilege.h>
 #import <wtf/RetainPtr.h>
 #import <wtf/Threading.h>
 #import <wtf/UniqueArray.h>
+#import <wtf/WTFProcess.h>
 #import <wtf/WorkQueue.h>
 #import <wtf/cocoa/CrashReporter.h>
 #import <wtf/cocoa/TypeCastsCocoa.h>

diff --git a/Tools/WebKitTestRunner/TestController.cpp b/Tools/WebKitTestRunner/TestController.cpp
@@ -87,14 +87,14 @@
 #include <wtf/CryptographicallyRandomNumber.h>
 #include <wtf/FileSystem.h>
 #include <wtf/MainThread.h>
-#include <wtf/Process.h>
 #include <wtf/ProcessPrivilege.h>
 #include <wtf/RefCounted.h>
 #include <wtf/RunLoop.h>
 #include <wtf/SetForScope.h>
 #include <wtf/UUID.h>
 #include <wtf/UniqueArray.h>
 #include <wtf/UniqueRef.h>
+#include <wtf/WTFProcess.h>
 #include <wtf/text/CString.h>
 #include <wtf/text/StringConcatenateNumbers.h>