f9e1049018
Mozilla Firefox is a free, open-source and cross-platform web browser for Windows, Linux, MacOS X and many other operating systems. It is fast and easy to use, and offers many advantages over other web browsers, such as tabbed browsing and the ability to block pop-up windows. Firefox also offers excellent bookmark and history management, and it can be extended by developers using industry standards such as XML, CSS, JavaScript, C++, etc. Many extensions are available.
59 lines
2.4 KiB
C++
59 lines
2.4 KiB
C++
$NetBSD: patch-xpcom_base_nsStackWalk.cpp,v 1.1 2014/11/03 12:18:32 ryoon Exp $
|
|
|
|
* Replace XP_MACOSX with XP_DARWIN as the former is not defined when
|
|
the toolkit is not cocoa.
|
|
|
|
--- xpcom/base/nsStackWalk.cpp.orig 2014-05-29 23:31:50.000000000 +0000
|
|
+++ xpcom/base/nsStackWalk.cpp
|
|
@@ -33,8 +33,8 @@ static CriticalAddress gCriticalAddress;
|
|
#include <dlfcn.h>
|
|
#endif
|
|
|
|
-#define NSSTACKWALK_SUPPORTS_MACOSX \
|
|
- (defined(XP_MACOSX) && \
|
|
+#define NSSTACKWALK_SUPPORTS_DARWIN \
|
|
+ (defined(XP_DARWIN) && \
|
|
(defined(__i386) || defined(__ppc__) || defined(HAVE__UNWIND_BACKTRACE)))
|
|
|
|
#define NSSTACKWALK_SUPPORTS_LINUX \
|
|
@@ -42,11 +42,11 @@ static CriticalAddress gCriticalAddress;
|
|
((defined(__GNUC__) && (defined(__i386) || defined(PPC))) || \
|
|
defined(HAVE__UNWIND_BACKTRACE)))
|
|
|
|
-#define NSSTACKWALK_SUPPORTS_SOLARIS \
|
|
+#define notNSSTACKWALK_SUPPORTS_SOLARIS \
|
|
(defined(__sun) && \
|
|
(defined(__sparc) || defined(sparc) || defined(__i386) || defined(i386)))
|
|
|
|
-#if NSSTACKWALK_SUPPORTS_MACOSX
|
|
+#if NSSTACKWALK_SUPPORTS_DARWIN
|
|
#include <pthread.h>
|
|
#include <CoreServices/CoreServices.h>
|
|
|
|
@@ -838,7 +838,7 @@ NS_FormatCodeAddressDetails(void *aPC, c
|
|
|
|
// WIN32 x86 stack walking code
|
|
// i386 or PPC Linux stackwalking code or Solaris
|
|
-#elif HAVE_DLADDR && (HAVE__UNWIND_BACKTRACE || NSSTACKWALK_SUPPORTS_LINUX || NSSTACKWALK_SUPPORTS_SOLARIS || NSSTACKWALK_SUPPORTS_MACOSX)
|
|
+#elif HAVE_DLADDR && (HAVE__UNWIND_BACKTRACE || NSSTACKWALK_SUPPORTS_LINUX || NSSTACKWALK_SUPPORTS_SOLARIS || NSSTACKWALK_SUPPORTS_DARWIN)
|
|
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
@@ -1162,7 +1162,7 @@ FramePointerStackWalk(NS_WalkStackCallba
|
|
(long(next) & 3)) {
|
|
break;
|
|
}
|
|
-#if (defined(__ppc__) && defined(XP_MACOSX)) || defined(__powerpc64__)
|
|
+#if (defined(__ppc__) && defined(XP_DARWIN)) || defined(__powerpc64__)
|
|
// ppc mac or powerpc64 linux
|
|
void *pc = *(bp+2);
|
|
bp += 3;
|
|
@@ -1192,7 +1192,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)
|
|
NS_StackWalk(NS_WalkStackCallback aCallback, uint32_t aSkipFrames,
|