aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/cxxabi.h2
-rw-r--r--src/exception.cc4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/cxxabi.h b/src/cxxabi.h
index 6ca635c..375287c 100644
--- a/src/cxxabi.h
+++ b/src/cxxabi.h
@@ -157,7 +157,7 @@ __cxa_eh_globals *__cxa_get_globals(void);
* Version of __cxa_get_globals() assuming that __cxa_get_globals() has already
* been called at least once by this thread.
*/
-__cxa_eh_globals *__cxa_get_globals(void);
+__cxa_eh_globals *__cxa_get_globals_fast(void);
/**
* Throws an exception returned by __cxa_current_primary_exception(). This
diff --git a/src/exception.cc b/src/exception.cc
index c9adcc6..6823e1c 100644
--- a/src/exception.cc
+++ b/src/exception.cc
@@ -272,7 +272,7 @@ static __cxa_thread_info *thread_info_fast()
/**
* ABI function returning the __cxa_eh_globals structure.
*/
-extern "C" __cxa_eh_globals *__cxa_get_globals(void)
+extern "C" __cxa_eh_globals *ABI_NAMESPACE::__cxa_get_globals(void)
{
return &(thread_info()->globals);
}
@@ -280,7 +280,7 @@ extern "C" __cxa_eh_globals *__cxa_get_globals(void)
* Version of __cxa_get_globals() assuming that __cxa_get_globals() has already
* been called at least once by this thread.
*/
-extern "C" __cxa_eh_globals *__cxa_get_globals_fast(void)
+extern "C" __cxa_eh_globals *ABI_NAMESPACE::__cxa_get_globals_fast(void)
{
return &(thread_info_fast()->globals);
}