From dd9d10adcb982ee8986decc3aabaf49b8f09764e Mon Sep 17 00:00:00 2001
From: "dougt%netscape.com" <dougt%netscape.com>
Date: Thu, 16 Jan 2003 00:24:56 +0000
Subject: [PATCH] defining DemangleSymbol on all 'nix platform - fixing bustage

---
 xpcom/base/nsStackFrameUnix.cpp | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/xpcom/base/nsStackFrameUnix.cpp b/xpcom/base/nsStackFrameUnix.cpp
index e4777c4ad4cc..7f0921d24f36 100644
--- a/xpcom/base/nsStackFrameUnix.cpp
+++ b/xpcom/base/nsStackFrameUnix.cpp
@@ -51,10 +51,7 @@
 #endif
 
 
-#if defined(linux) && defined(__GLIBC__) && (defined(__i386) || defined(PPC)) // i386 or PPC Linux stackwalking code
 
-#include <setjmp.h>
-//
 // This thing is exported by libiberty.a (-liberty)
 // Yes, this is a gcc only hack
 #if defined(MOZ_DEMANGLE_SYMBOLS)
@@ -62,6 +59,7 @@ extern "C" char * cplus_demangle(const char *,int);
 #include <stdlib.h> // for free()
 #endif // MOZ_DEMANGLE_SYMBOLS
 
+#if (defined(__linux__) || defined(__sun)) && defined(__GNUC__)
 void DemangleSymbol(const char * aSymbol, 
                     char * aBuffer,
                     int aBufLen)
@@ -80,6 +78,23 @@ void DemangleSymbol(const char * aSymbol,
 #endif // MOZ_DEMANGLE_SYMBOLS
 }
 
+#elif
+void DemangleSymbol(const char * aSymbol, 
+                    char * aBuffer,
+                    int aBufLen)
+{
+  // lose
+  aBuffer[0] = '\0';
+}
+#endif
+
+
+
+#if defined(linux) && defined(__GLIBC__) && (defined(__i386) || defined(PPC)) // i386 or PPC Linux stackwalking code
+
+#include <setjmp.h>
+//
+
 void DumpStackToFile(FILE* aStream)
 {
   jmp_buf jb;