diff options
| author | Moonchild <moonchild@palemoon.org> | 2019-11-02 14:37:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-02 14:37:22 +0100 |
| commit | 21b3f6247403c06f85e1f45d219f87549862198f (patch) | |
| tree | 0038ae92f1cc7aaff0b55d6e5ac59efcc28bdf8f /toolkit/components/terminator/nsTerminator.cpp | |
| parent | ff881bdb6795e0f307b93919f98f454bedde4bb6 (diff) | |
| parent | a9dc528a4a7b0aaad5308aff70963485ec3e9bec (diff) | |
| download | UXP-21b3f6247403c06f85e1f45d219f87549862198f.tar UXP-21b3f6247403c06f85e1f45d219f87549862198f.tar.gz UXP-21b3f6247403c06f85e1f45d219f87549862198f.tar.lz UXP-21b3f6247403c06f85e1f45d219f87549862198f.tar.xz UXP-21b3f6247403c06f85e1f45d219f87549862198f.zip | |
Merge pull request #1262 from athenian200/solaris-work
Support Modern Solaris
Diffstat (limited to 'toolkit/components/terminator/nsTerminator.cpp')
| -rw-r--r-- | toolkit/components/terminator/nsTerminator.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/toolkit/components/terminator/nsTerminator.cpp b/toolkit/components/terminator/nsTerminator.cpp index 91e872821..9f6a90b57 100644 --- a/toolkit/components/terminator/nsTerminator.cpp +++ b/toolkit/components/terminator/nsTerminator.cpp @@ -30,7 +30,7 @@ #include "nsIObserverService.h" #include "nsIPrefService.h" -#if defined(XP_WIN) +#ifdef XP_WIN #include <windows.h> #else #include <unistd.h> @@ -385,7 +385,11 @@ nsTerminator::StartWatchdog() } UniquePtr<Options> options(new Options()); +#ifdef XP_SOLARIS const PRIntervalTime ticksDuration = PR_MillisecondsToInterval(1000); +#else + const PRIntervalTime ticksDuration = 1000; +#endif options->crashAfterTicks = crashAfterMS / ticksDuration; DebugOnly<PRThread*> watchdogThread = CreateSystemThread(RunWatchdog, |