diff options
| author | Brian Smith <brian@dbsoft.org> | 2022-04-26 11:07:23 -0500 |
|---|---|---|
| committer | Brian Smith <brian@dbsoft.org> | 2022-04-26 11:07:23 -0500 |
| commit | 9e2a89c71ddf67975da35eb100673f6b5546f292 (patch) | |
| tree | ca7b972015f5ad2388d416fa0ec8f506cc9fb8d6 /js/src/vm | |
| parent | 68d1c14bdf79d1c536ae05a4ce33fd9601c277eb (diff) | |
| download | uxp-9e2a89c71ddf67975da35eb100673f6b5546f292.tar.gz | |
Issue #1829 - Revert "Issue #1751 -- Remove XP_DARWIN"
This reverts commit 3d671e4275c73a1484c72713304c6e04ec4ffc7c.
Diffstat (limited to 'js/src/vm')
| -rw-r--r-- | js/src/vm/Runtime.cpp | 6 | ||||
| -rw-r--r-- | js/src/vm/Runtime.h | 7 |
2 files changed, 11 insertions, 2 deletions
diff --git a/js/src/vm/Runtime.cpp b/js/src/vm/Runtime.cpp index 23c50814fc..251c8258cf 100644 --- a/js/src/vm/Runtime.cpp +++ b/js/src/vm/Runtime.cpp @@ -10,12 +10,14 @@ #include "mozilla/ThreadLocal.h" #include "mozilla/Unused.h" -#if defined(XP_UNIX) +#if defined(XP_DARWIN) +#include <mach/mach.h> +#elif defined(XP_UNIX) #include <sys/resource.h> #elif defined(XP_WIN) #include <processthreadsapi.h> #include <windows.h> -#endif // defined(XP_UNIX) || defined(XP_WIN) +#endif // defined(XP_DARWIN) || defined(XP_UNIX) || defined(XP_WIN) #include <locale.h> #include <string.h> diff --git a/js/src/vm/Runtime.h b/js/src/vm/Runtime.h index eefc90cb4c..f1f2e07094 100644 --- a/js/src/vm/Runtime.h +++ b/js/src/vm/Runtime.h @@ -21,6 +21,9 @@ #include "jsclist.h" #include "jsscript.h" +#ifdef XP_DARWIN +# include "wasm/WasmSignalHandlers.h" +#endif #include "builtin/AtomicsObject.h" #include "builtin/Intl.h" #include "builtin/Promise.h" @@ -929,6 +932,10 @@ struct JSRuntime : public JS::shadow::Runtime, */ JSCList onNewGlobalObjectWatchers; +#if defined(XP_DARWIN) + js::wasm::MachExceptionHandler wasmMachExceptionHandler; +#endif + private: js::FreeOp* defaultFreeOp_; |