diff options
| author | David Chisnall <dchisnall@pathscale.com> | 2014-05-09 01:35:15 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-09 01:35:15 +0000 |
| commit | b02c15f56f84c876845059c8e1905723a6f889d1 (patch) | |
| tree | 1142054e9e5c20edac543bd4d0c16a650cdd7dfb | |
| parent | 5e8620362921bb51c5cbf3d38c9c4958aa99484a (diff) | |
| parent | a24acdd2378f4cdb8c9e9202da4b076047814928 (diff) | |
| download | libcxxrt-b02c15f56f84c876845059c8e1905723a6f889d1.tar.gz | |
am a24acdd2: Tweak some definitions to make clang happy.
* commit 'a24acdd2378f4cdb8c9e9202da4b076047814928':
Tweak some definitions to make clang happy.
| -rw-r--r-- | src/cxxabi.h | 2 | ||||
| -rw-r--r-- | src/exception.cc | 4 |
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); } |