Import of pkgsrc-2015Q3
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
$NetBSD: patch-mozilla_xpcom_base_nsStackWalk.cpp,v 1.5 2015/02/15 02:11:03 ryoon Exp $
|
||||
$NetBSD: patch-mozilla_xpcom_base_nsStackWalk.cpp,v 1.6 2015/09/21 05:03:45 ryoon Exp $
|
||||
|
||||
--- mozilla/xpcom/base/nsStackWalk.cpp.orig 2015-02-05 04:38:49.000000000 +0000
|
||||
--- mozilla/xpcom/base/nsStackWalk.cpp.orig 2015-09-02 09:27:33.000000000 +0000
|
||||
+++ mozilla/xpcom/base/nsStackWalk.cpp
|
||||
@@ -34,12 +34,12 @@ static CriticalAddress gCriticalAddress;
|
||||
#define _GNU_SOURCE
|
||||
@@ -27,7 +27,7 @@ $NetBSD: patch-mozilla_xpcom_base_nsStackWalk.cpp,v 1.5 2015/02/15 02:11:03 ryoo
|
||||
#include <pthread.h>
|
||||
#include <CoreServices/CoreServices.h>
|
||||
|
||||
@@ -832,7 +832,7 @@ NS_DescribeCodeAddress(void* aPC, nsCode
|
||||
@@ -830,7 +830,7 @@ NS_DescribeCodeAddress(void* aPC, nsCode
|
||||
}
|
||||
|
||||
// i386 or PPC Linux stackwalking code
|
||||
@@ -36,7 +36,7 @@ $NetBSD: patch-mozilla_xpcom_base_nsStackWalk.cpp,v 1.5 2015/02/15 02:11:03 ryoo
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
@@ -903,7 +903,7 @@ FramePointerStackWalk(NS_WalkStackCallba
|
||||
@@ -901,7 +901,7 @@ FramePointerStackWalk(NS_WalkStackCallba
|
||||
(long(next) & 3)) {
|
||||
break;
|
||||
}
|
||||
@@ -45,12 +45,12 @@ $NetBSD: patch-mozilla_xpcom_base_nsStackWalk.cpp,v 1.5 2015/02/15 02:11:03 ryoo
|
||||
// ppc mac or powerpc64 linux
|
||||
void* pc = *(bp + 2);
|
||||
bp += 3;
|
||||
@@ -933,7 +933,7 @@ FramePointerStackWalk(NS_WalkStackCallba
|
||||
@@ -931,7 +931,7 @@ FramePointerStackWalk(NS_WalkStackCallba
|
||||
}
|
||||
|
||||
#define X86_OR_PPC (defined(__i386) || defined(PPC) || defined(__ppc__))
|
||||
-#if X86_OR_PPC && (NSSTACKWALK_SUPPORTS_MACOSX || NSSTACKWALK_SUPPORTS_LINUX) // i386 or PPC Linux or Mac stackwalking code
|
||||
+#if X86_OR_PPC && (NSSTACKWALK_SUPPORTS_DARWIN || NSSTACKWALK_SUPPORTS_LINUX) // i386 or PPC Linux or Mac stackwalking code
|
||||
|
||||
EXPORT_XPCOM_API(nsresult)
|
||||
XPCOM_API(nsresult)
|
||||
NS_StackWalk(NS_WalkStackCallback aCallback, uint32_t aSkipFrames,
|
||||
|
||||
Reference in New Issue
Block a user