diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:14:29 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:14:29 +0000 |
| commit | fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8 (patch) | |
| tree | 4c1ccaf5486d4f2009f9a338a98a83e886e29c97 /toolkit/components/processtools/ProcInfo.h | |
| parent | Releasing progress-linux version 124.0.1-1~progress7.99u1. (diff) | |
| download | firefox-fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8.tar.xz firefox-fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8.zip | |
Merging upstream version 125.0.1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'toolkit/components/processtools/ProcInfo.h')
| -rw-r--r-- | toolkit/components/processtools/ProcInfo.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/toolkit/components/processtools/ProcInfo.h b/toolkit/components/processtools/ProcInfo.h index d7e557b42e..7fd2d7aae8 100644 --- a/toolkit/components/processtools/ProcInfo.h +++ b/toolkit/components/processtools/ProcInfo.h @@ -171,10 +171,10 @@ struct ProcInfoRequest { ProcInfoRequest(base::ProcessId aPid, ProcType aProcessType, const nsACString& aOrigin, nsTArray<WindowInfo>&& aWindowInfo, nsTArray<UtilityInfo>&& aUtilityInfo, uint32_t aChildId = 0 -#ifdef XP_MACOSX +#ifdef XP_DARWIN , mach_port_t aChildTask = 0 -#endif // XP_MACOSX +#endif // XP_DARWIN ) : pid(aPid), processType(aProcessType), @@ -182,10 +182,10 @@ struct ProcInfoRequest { windowInfo(std::move(aWindowInfo)), utilityInfo(std::move(aUtilityInfo)), childId(aChildId) -#ifdef XP_MACOSX +#ifdef XP_DARWIN , childTask(aChildTask) -#endif // XP_MACOSX +#endif // XP_DARWIN { } const base::ProcessId pid; @@ -195,9 +195,9 @@ struct ProcInfoRequest { const nsTArray<UtilityInfo> utilityInfo; // If the process is a child, its child id, otherwise `0`. const int32_t childId; -#ifdef XP_MACOSX +#ifdef XP_DARWIN const mach_port_t childTask; -#endif // XP_MACOSX +#endif // XP_DARWIN }; /** |