X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdebug%2Fdemangle.cpp;h=053fd52bc4a867a9a1f8d3f63641fdf4962d0f4b;hb=d5dd704b2576f878809e87dbb8ff8591b9bdbce4;hp=460410e49569f501ed4792929650c62068cdf243;hpb=0fa00d18f607f329d2b2a979e1d4339e233817fa;p=libs%2Fcore.git

diff --git a/source/debug/demangle.cpp b/source/debug/demangle.cpp
index 460410e..053fd52 100644
--- a/source/debug/demangle.cpp
+++ b/source/debug/demangle.cpp
@@ -5,7 +5,10 @@ Copyright © 2007 Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
+#include <cstdlib>
+#ifdef __GNUC__
 #include <cxxabi.h>
+#endif
 #include "demangle.h"
 
 using namespace std;
@@ -17,9 +20,16 @@ string demangle(const string &sym)
 {
 #ifdef __GNUC__
 	int status;
-	char *dm=abi::__cxa_demangle(sym.c_str(), 0, 0, &status);
-	string result(dm);
+	char *dm = abi::__cxa_demangle(sym.c_str(), 0, 0, &status);
+	
+	string result;
+	if(status==0)
+		result = dm;
+	else
+		result = sym;
+	
 	free(dm);
+
 	return result;
 #else
 	return sym;