3 --- xpcom/base/nsStackWalk.cpp.orig 2009-02-04 01:06:49.000000000 +0900
4 +++ xpcom/base/nsStackWalk.cpp
5 @@ -1107,7 +1107,7 @@ NS_FormatCodeAddressDetails(void *aPC, c
7 // WIN32 x86 stack walking code
8 // i386 or PPC Linux stackwalking code or Solaris
9 -#elif HAVE_DLADDR && (HAVE__UNWIND_BACKTRACE || (defined(linux) && defined(__GNUC__) && (defined(__i386) || defined(PPC))) || (defined(__sun) && (defined(__sparc) || defined(sparc) || defined(__i386) || defined(i386))) || (defined(XP_MACOSX) && (defined(__ppc__) || defined(__i386))))
10 +#elif HAVE_DLADDR && (HAVE__UNWIND_BACKTRACE || (defined(linux) && defined(__GNUC__) && (defined(__i386) || defined(PPC))) || (defined(__sun) && (defined(__sparc) || defined(sparc) || defined(__i386) || defined(i386))) || (defined(__APPLE__) && (defined(__ppc__) || defined(__i386))))
14 @@ -1124,7 +1124,7 @@ NS_FormatCodeAddressDetails(void *aPC, c
18 -#if defined(HAVE_LIBDL) || defined(XP_MACOSX)
19 +#if defined(HAVE_LIBDL) || defined(__APPLE__)
23 @@ -1394,7 +1394,7 @@ NS_FormatCodeAddressDetails(void *aPC, c
25 #else // not __sun-specific
27 -#if (defined(linux) && defined(__GNUC__) && (defined(__i386) || defined(PPC))) || (defined(XP_MACOSX) && (defined(__i386) || defined(__ppc__))) // i386 or PPC Linux or Mac stackwalking code
28 +#if (defined(linux) && defined(__GNUC__) && (defined(__i386) || defined(PPC))) || (defined(__APPLE__) && (defined(__i386) || defined(__ppc__))) // i386 or PPC Linux or Mac stackwalking code
30 #if __GLIBC__ > 2 || __GLIBC_MINOR > 1
31 #define HAVE___LIBC_STACK_END 1
32 @@ -1437,7 +1437,7 @@ NS_StackWalk(NS_WalkStackCallback aCallb
36 -#if (defined(__ppc__) && defined(XP_MACOSX)) || defined(__powerpc64__)
37 +#if (defined(__ppc__) && defined(__APPLE__)) || defined(__powerpc64__)
38 // ppc mac or powerpc64 linux
40 #else // i386 or powerpc32 linux