diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-15 03:35:49 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-15 03:35:49 +0000 |
| commit | d8bbc7858622b6d9c278469aab701ca0b609cddf (patch) | |
| tree | eff41dc61d9f714852212739e6b3738b82a2af87 /ipc/glue/NodeController.cpp | |
| parent | Releasing progress-linux version 125.0.3-1~progress7.99u1. (diff) | |
| download | firefox-d8bbc7858622b6d9c278469aab701ca0b609cddf.tar.xz firefox-d8bbc7858622b6d9c278469aab701ca0b609cddf.zip | |
Merging upstream version 126.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'ipc/glue/NodeController.cpp')
| -rw-r--r-- | ipc/glue/NodeController.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ipc/glue/NodeController.cpp b/ipc/glue/NodeController.cpp index 532e4fa509..7781771660 100644 --- a/ipc/glue/NodeController.cpp +++ b/ipc/glue/NodeController.cpp @@ -315,7 +315,7 @@ void NodeController::ForwardEvent(const NodeName& aNode, // On Windows and macOS, messages holding HANDLEs or mach ports must be // relayed via the broker process so it can transfer ownership. bool needsRelay = false; -#if defined(XP_WIN) || defined(XP_MACOSX) +#if defined(XP_WIN) || defined(XP_DARWIN) if (!IsBroker() && aNode != kBrokerNodeName && aEvent->type() == Event::kUserMessage) { auto* userEvent = static_cast<UserMessageEvent*>(aEvent.get()); @@ -439,7 +439,7 @@ void NodeController::OnEventMessage(const NodeName& aFromNode, } NodeName fromNode = aFromNode; -#if defined(XP_WIN) || defined(XP_MACOSX) +#if defined(XP_WIN) || defined(XP_DARWIN) if (isRelay) { if (event->type() != Event::kUserMessage) { NODECONTROLLER_WARNING( |