diff options
author | Moonchild <moonchild@palemoon.org> | 2021-07-15 23:13:31 +0000 |
---|---|---|
committer | Moonchild <moonchild@palemoon.org> | 2021-07-15 23:13:31 +0000 |
commit | feafc2f129df921f9e2954f0a21b1060588e4a0f (patch) | |
tree | 248d2f8df51e96c0d518ae5c782ad801ec53702f /xpcom/threads/nsProcess.h | |
parent | 84825468041d590ff8c660c42cf93b0d2243ad52 (diff) | |
parent | c198ef11b9d2697501b3ea4cbcab98e4dad48a9d (diff) | |
download | uxp-RELBASE_20210719.tar.gz |
Merge branch 'master' into releaseRELBASE_20210719RC_20210715
Diffstat (limited to 'xpcom/threads/nsProcess.h')
-rw-r--r-- | xpcom/threads/nsProcess.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/xpcom/threads/nsProcess.h b/xpcom/threads/nsProcess.h index b9d0641770..21d28f1019 100644 --- a/xpcom/threads/nsProcess.h +++ b/xpcom/threads/nsProcess.h @@ -19,9 +19,7 @@ #include "nsIWeakReferenceUtils.h" #include "nsIObserver.h" #include "nsString.h" -#ifndef XP_MACOSX #include "prproces.h" -#endif #if defined(PROCESSMODEL_WINAPI) #include <windows.h> #include <shellapi.h> @@ -73,7 +71,7 @@ private: int32_t mExitValue; #if defined(PROCESSMODEL_WINAPI) HANDLE mProcess; -#elif !defined(XP_MACOSX) +#else PRProcess* mProcess; #endif }; |