diff options
| author | Brian Smith <brian@dbsoft.org> | 2022-04-26 10:13:11 -0500 |
|---|---|---|
| committer | Brian Smith <brian@dbsoft.org> | 2022-04-26 10:19:04 -0500 |
| commit | 3daf711085889bad1bd68651bc4e8790412ae105 (patch) | |
| tree | f5b0e4c1befb320cdf158e1839ac5e273373087f /mozglue | |
| parent | 7fe702603066e7f122d5dd66a3a1892ac7e06215 (diff) | |
| download | uxp-3daf711085889bad1bd68651bc4e8790412ae105.tar.gz | |
Issue #1829 - Revert “Issue #1751 -- Remove XP_MACOSX conditionals from the rest of the tree.”
This also removes some PP abuse and takes file entries out of PP when no longer
needed without XP_MACOSX conditionals.
This reverts commit 6f707bde95dab6998ac204f9ee6c925ee230c740.
Diffstat (limited to 'mozglue')
| -rw-r--r-- | mozglue/misc/StackWalk.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mozglue/misc/StackWalk.cpp b/mozglue/misc/StackWalk.cpp index 0fa2250aec..7d853b075d 100644 --- a/mozglue/misc/StackWalk.cpp +++ b/mozglue/misc/StackWalk.cpp @@ -939,7 +939,7 @@ MozDescribeCodeAddress(void* aPC, MozCodeAddressDetails* aDetails) #endif -#if defined(XP_WIN) || defined (XP_LINUX) +#if defined(XP_WIN) || defined (XP_MACOSX) || defined (XP_LINUX) namespace mozilla { bool FramePointerStackWalk(MozWalkStackCallback aCallback, uint32_t aSkipFrames, @@ -963,8 +963,8 @@ FramePointerStackWalk(MozWalkStackCallback aCallback, uint32_t aSkipFrames, (uintptr_t(next) & 3)) { break; } -#if defined(__powerpc64__) - // powerpc64 linux +#if (defined(__ppc__) && defined(XP_MACOSX)) || defined(__powerpc64__) + // ppc mac or powerpc64 linux void* pc = *(bp + 2); bp += 3; #else // i386 or powerpc32 linux |