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

diff --git a/source/debug/demangle.cpp b/source/debug/demangle.cpp
index 460410e..fc6ca78 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;
@@ -18,8 +21,15 @@ string demangle(const string &sym)
 #ifdef __GNUC__
 	int status;
 	char *dm=abi::__cxa_demangle(sym.c_str(), 0, 0, &status);
-	string result(dm);
+	
+	string result;
+	if(status==0)
+		result=dm;
+	else
+		result=sym;
+	
 	free(dm);
+
 	return result;
 #else
 	return sym;