summaryrefslogtreecommitdiff
path: root/tests/glthread
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff.email>2018-03-07 05:54:53 +0100
committerJörg Frings-Fürst <debian@jff.email>2018-03-07 05:54:53 +0100
commit76ef1d8e3249e82a6965fd17157bee00a7857ff3 (patch)
tree7d3d34b059039faf525d1e95bbdc1945a9fa103c /tests/glthread
parent0cb66c451a1a4e717878b8296b79c8d7cfd38b30 (diff)
parent93e8e16be294d19261c7378dd2e46d3f35f06926 (diff)
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'tests/glthread')
-rw-r--r--tests/glthread/thread.c2
-rw-r--r--tests/glthread/thread.h19
-rw-r--r--tests/glthread/yield.h2
3 files changed, 15 insertions, 8 deletions
diff --git a/tests/glthread/thread.c b/tests/glthread/thread.c
index 8d7d2519..0387406b 100644
--- a/tests/glthread/thread.c
+++ b/tests/glthread/thread.c
@@ -1,5 +1,5 @@
/* Creating and controlling threads.
- Copyright (C) 2005-2017 Free Software Foundation, Inc.
+ Copyright (C) 2005-2018 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/tests/glthread/thread.h b/tests/glthread/thread.h
index b64e267f..8bc857fe 100644
--- a/tests/glthread/thread.h
+++ b/tests/glthread/thread.h
@@ -1,5 +1,5 @@
/* Creating and controlling threads.
- Copyright (C) 2005-2017 Free Software Foundation, Inc.
+ Copyright (C) 2005-2018 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -54,7 +54,7 @@
gl_thread_exit (return_value);
extern _Noreturn void gl_thread_exit (void *return_value);
- Requesting custom code to be executed at fork() time(not supported on all
+ Requesting custom code to be executed at fork() time (not supported on all
platforms):
gl_thread_atfork (prepare_func, parent_func, child_func);
Or with control of error handling:
@@ -90,6 +90,17 @@ _GL_INLINE_HEADER_BEGIN
# include <pthread.h>
+/* On IRIX, pthread_atfork is declared in <unistd.h>, not in <pthread.h>. */
+# if defined __sgi
+# include <unistd.h>
+# endif
+
+# if USE_POSIX_THREADS_WEAK
+/* Compilers other than GCC need to see the declaration of pthread_sigmask
+ before the "#pragma weak pthread_sigmask" below. */
+# include <signal.h>
+# endif
+
# ifdef __cplusplus
extern "C" {
# endif
@@ -124,10 +135,6 @@ extern int glthread_in_use (void);
# pragma weak pthread_create
-# ifdef __clang__
- /* Without this, clang complains that pthread_sigmask is never declared. */
-# include <signal.h>
-# endif
# ifndef pthread_sigmask /* Do not declare rpl_pthread_sigmask weak. */
# pragma weak pthread_sigmask
# endif
diff --git a/tests/glthread/yield.h b/tests/glthread/yield.h
index b5718284..4bb3ed48 100644
--- a/tests/glthread/yield.h
+++ b/tests/glthread/yield.h
@@ -1,5 +1,5 @@
/* Yielding the processor to other threads and processes.
- Copyright (C) 2005-2017 Free Software Foundation, Inc.
+ Copyright (C) 2005-2018 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by