diff options
author | Jonathan Wakely <jwakely.gcc@gmail.com> | 2011-11-07 07:54:06 +0000 |
---|---|---|
committer | Jonathan Wakely <redi@gcc.gnu.org> | 2011-11-07 07:54:06 +0000 |
commit | ff02a38bc6b5afb0283d2d9a9ed16c92623ee331 (patch) | |
tree | 051d9dcdd5d1d9694ed7978b00ea77d12400731f | |
parent | b9b8c6ae3902b5ce95a5be7368068ce9092cf4c4 (diff) | |
download | gcc-ff02a38bc6b5afb0283d2d9a9ed16c92623ee331.zip gcc-ff02a38bc6b5afb0283d2d9a9ed16c92623ee331.tar.gz gcc-ff02a38bc6b5afb0283d2d9a9ed16c92623ee331.tar.bz2 |
re PR libstdc++/50982 (AIX libstdc++ GTHREADS incompatibility)
PR libstdc++/50982
* include/std/mutex (__once_proxy): Use void parameter list to
work on implicit extern "C" systems.
From-SVN: r181072
-rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
-rw-r--r-- | libstdc++-v3/include/std/mutex | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 299bee9..408b0d4 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2011-11-07 Jonathan Wakely <jwakely.gcc@gmail.com> + + PR libstdc++/50982 + * include/std/mutex (__once_proxy): Use void parameter list to + work on implicit extern "C" systems. + 2011-11-07 Xinliang David Li <davidxl@google.com> * include/backward/hashtable.h: Make __stl_prime_list diff --git a/libstdc++-v3/include/std/mutex b/libstdc++-v3/include/std/mutex index 321a332..bc2675b 100644 --- a/libstdc++-v3/include/std/mutex +++ b/libstdc++-v3/include/std/mutex @@ -796,7 +796,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION __get_once_mutex(); #endif - extern "C" void __once_proxy(); + extern "C" void __once_proxy(void); /// call_once template<typename _Callable, typename... _Args> |