From 3e913de2d24f10f40936198f599657225fb346fd Mon Sep 17 00:00:00 2001 From: Steve Checkoway Date: Fri, 13 Oct 2006 05:11:54 +0000 Subject: [PATCH] Fix warning coming from system headers. Add a newline in error messages that will likely never be emitted... --- stepmania/src/archutils/Unix/BacktraceNames.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/stepmania/src/archutils/Unix/BacktraceNames.cpp b/stepmania/src/archutils/Unix/BacktraceNames.cpp index 2a975da4b3..32736604c0 100644 --- a/stepmania/src/archutils/Unix/BacktraceNames.cpp +++ b/stepmania/src/archutils/Unix/BacktraceNames.cpp @@ -33,7 +33,9 @@ void BacktraceNames::Demangle() free(f); } #elif defined(HAVE_CXA_DEMANGLE) -#include +namespace abi { + extern "C" char *__cxa_demangle( const char *mangled_name, char *buf, size_t *n, int *status); +} void BacktraceNames::Demangle() { @@ -42,7 +44,7 @@ void BacktraceNames::Demangle() return; int status = 0; - char *name = abi::__cxa_demangle( Symbol, 0, 0, &status ); + char *name = abi::__cxa_demangle( Symbol, NULL, NULL, &status ); if( name ) { Symbol = name; @@ -62,7 +64,7 @@ void BacktraceNames::Demangle() fprintf( stderr, "Invalid arguments.\n" ); break; default: - fprintf( stderr, "Unexpected __cxa_demangle status: %i", status ); + fprintf( stderr, "Unexpected __cxa_demangle status: %i\n", status ); break; } }