From c72f9acbc6a63e76df72c5708b33e867825b30bc Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Wed, 11 Dec 2019 09:37:55 +0100 Subject: [PATCH] pthread-thread: Fix compilation error in C++ mode on MSVC. * lib/pthread.in.h (pthread_exit): Don't use _Noreturn in the _GL_CXXALIAS_RPL invocation. --- ChangeLog | 6 ++++++ lib/pthread.in.h | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 0bbb7249b2..c87e8a06e5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2019-12-11 Bruno Haible + + pthread-thread: Fix compilation error in C++ mode on MSVC. + * lib/pthread.in.h (pthread_exit): Don't use _Noreturn in the + _GL_CXXALIAS_RPL invocation. + 2019-12-08 Bruno Haible Fix compilation errors in C++ mode on Haiku. diff --git a/lib/pthread.in.h b/lib/pthread.in.h index a70d0234e5..a6fb3d96e4 100644 --- a/lib/pthread.in.h +++ b/lib/pthread.in.h @@ -684,7 +684,7 @@ _GL_WARN_ON_USE (pthread_join, "pthread_join is not portable - " # define pthread_exit rpl_pthread_exit # endif _GL_FUNCDECL_RPL (pthread_exit, _Noreturn void, (void *value)); -_GL_CXXALIAS_RPL (pthread_exit, _Noreturn void, (void *value)); +_GL_CXXALIAS_RPL (pthread_exit, void, (void *value)); # else # if !@HAVE_PTHREAD_EXIT@ _GL_FUNCDECL_SYS (pthread_exit, _Noreturn void, (void *value)); -- 2.39.5