Rename cpp_demangle_gnu3 to __cxa_demangle_gnu3 to fit into the

implementation namespace of the library.
berkus · May 20, 2011 · 0026ef5 · 0026ef5
1 parent 798f9da
commit 0026ef5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/libelftc_dem_gnu3.c b/src/libelftc_dem_gnu3.c
@@ -449,7 +449,7 @@ static int cpp_demangle_gnu3_push_head;
  * @todo 1. Testing and more test case. 2. Code cleaning.
  */
 char *
-cpp_demangle_gnu3(const char *org)
+__cxa_demangle_gnu3(const char *org)
 {
 	struct cpp_demangle_data ddata;
 	ssize_t org_len;

diff --git a/src/typeinfo.cc b/src/typeinfo.cc
@@ -44,7 +44,7 @@ ABI_NAMESPACE::__pointer_type_info::~__pointer_type_info() {}
 ABI_NAMESPACE::__pointer_to_member_type_info::~__pointer_to_member_type_info() {}
 
 // From libelftc
-extern "C" char    *cpp_demangle_gnu3(const char *);
+extern "C" char    *__cxa_demangle_gnu3(const char *);
 
 /**
  * Demangles a C++ symbol or type name.  The buffer, if non-NULL, must be
@@ -69,7 +69,7 @@ extern "C" char* __cxa_demangle(const char* mangled_name,
 	// however, and for our changes to be pushed upstream.  We also need to
 	// call a different demangling function here depending on the ABI (e.g.
 	// ARM).
-	char *demangled = cpp_demangle_gnu3(mangled_name);
+	char *demangled = __cxa_demangle_gnu3(mangled_name);
 	if (NULL != demangled)
 	{
 		size_t len = strlen(demangled);