[webkit-changes] [WebKit/WebKit] f0c7ad: wtf/Process.h is conflicting with process.h on Win...

Fujii Hironori noreply at github.com
Sun Apr 9 23:07:48 PDT 2023


  Branch: refs/heads/main
  Home:   https://github.com/WebKit/WebKit
  Commit: f0c7ad4d9de932871e5e01c463a25c02db140b99
      https://github.com/WebKit/WebKit/commit/f0c7ad4d9de932871e5e01c463a25c02db140b99
  Author: Fujii Hironori <Hironori.Fujii at sony.com>
  Date:   2023-04-09 (Sun, 09 Apr 2023)

  Changed paths:
    M Source/JavaScriptCore/API/tests/ExecutionTimeLimitTest.cpp
    M Source/JavaScriptCore/API/tests/testapi.mm
    M Source/JavaScriptCore/assembler/testmasm.cpp
    M Source/JavaScriptCore/b3/air/testair.cpp
    M Source/JavaScriptCore/b3/testb3.h
    M Source/JavaScriptCore/dfg/testdfg.cpp
    M Source/JavaScriptCore/jsc.cpp
    M Source/JavaScriptCore/runtime/ResourceExhaustion.cpp
    M Source/JavaScriptCore/testRegExp.cpp
    M Source/JavaScriptCore/tools/FunctionOverrides.cpp
    M Source/JavaScriptCore/tools/JSDollarVM.cpp
    M Source/WTF/WTF.xcodeproj/project.pbxproj
    M Source/WTF/wtf/CMakeLists.txt
    R Source/WTF/wtf/Process.cpp
    R Source/WTF/wtf/Process.h
    A Source/WTF/wtf/WTFProcess.cpp
    A Source/WTF/wtf/WTFProcess.h
    M Source/WebCore/workers/service/context/SWContextManager.cpp
    M Source/WebGPU/WGSL/wgslc.cpp
    M Source/WebKit/NetworkProcess/NetworkProcess.cpp
    M Source/WebKit/Platform/IPC/Connection.cpp
    M Source/WebKit/Shared/AuxiliaryProcess.cpp
    M Source/WebKit/Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceEntryPoint.h
    M Source/WebKit/Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceEntryPoint.mm
    M Source/WebKit/Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceMain.mm
    M Source/WebKit/Shared/IPCStreamTester.cpp
    M Source/WebKit/Shared/mac/AuxiliaryProcessMac.mm
    M Source/WebKit/WebProcess/WebProcess.cpp
    M Source/WebKit/webpushd/WebPushDaemonMain.mm
    M Source/WebKit/webpushd/webpushtool/WebPushToolMain.mm
    M Tools/DumpRenderTree/mac/DumpRenderTree.mm
    M Tools/WebKitTestRunner/TestController.cpp
    M Tools/WebKitTestRunner/gtk/TestControllerGtk.cpp
    M Tools/WebKitTestRunner/win/TestControllerWin.cpp
    M Tools/WebKitTestRunner/wpe/TestControllerWPE.cpp

  Log Message:
  -----------
  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 at 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




More information about the webkit-changes mailing list