diff options
| author | Yvan Roux <yvan.roux@linaro.org> | 2016-05-11 13:45:56 +0200 |
|---|---|---|
| committer | Yvan Roux <yvan.roux@linaro.org> | 2016-05-11 13:45:56 +0200 |
| commit | cf2693b851f4a3a53f015c2113b9d6dc7ae54fe6 (patch) | |
| tree | f0f998391d67ff63cbb8934194b2665a952db641 /libstdc++-v3/src/c++11 | |
| parent | 128df3b55b1b42a5f876fc9f8875d96ee02d0d6c (diff) | |
Merge branches/gcc-5-branch rev 236108.
Change-Id: I421c7be7ac36a838c822da9b9412865e9e4fb1fa
Diffstat (limited to 'libstdc++-v3/src/c++11')
| -rw-r--r-- | libstdc++-v3/src/c++11/thread.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libstdc++-v3/src/c++11/thread.cc b/libstdc++-v3/src/c++11/thread.cc index 906cafa735a..7fa415b49d1 100644 --- a/libstdc++-v3/src/c++11/thread.cc +++ b/libstdc++-v3/src/c++11/thread.cc @@ -70,9 +70,9 @@ static inline int get_nprocs() namespace std _GLIBCXX_VISIBILITY(default) { - namespace + extern "C" { - extern "C" void* + static void* execute_native_thread_routine(void* __p) { thread::_Impl_base* __t = static_cast<thread::_Impl_base*>(__p); @@ -94,7 +94,7 @@ namespace std _GLIBCXX_VISIBILITY(default) return nullptr; } - } + } // extern "C" _GLIBCXX_BEGIN_NAMESPACE_VERSION |