diff options
| author | Bruno Haible <bruno@clisp.org> | 2021-06-07 21:26:31 +0200 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2021-06-07 21:26:31 +0200 |
| commit | 5067cc8cde85d34c0e2686f60ca7a2e0fee02998 (patch) | |
| tree | 439cb770a84e51471b299095793940d57d240667 | |
| parent | e2bcd2e4d982ea390a8edc3e8c94a3ef47eda327 (diff) | |
| download | gnulib-5067cc8cde85d34c0e2686f60ca7a2e0fee02998.tar.gz | |
thread: Fix test link error on DragonFly BSD 6.0.
* lib/glthread/thread.c (gl_thread_create): Moved to here...
* lib/glthread/thread.h (gl_thread_create): ...from here.
(_GLTHREAD_THREAD_INLINE): Remove macro.
Remove _GL_INLINE_HEADER_BEGIN/END invocations.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | lib/glthread/thread.c | 13 | ||||
| -rw-r--r-- | lib/glthread/thread.h | 22 |
3 files changed, 21 insertions, 22 deletions
@@ -1,3 +1,11 @@ +2021-06-07 Bruno Haible <bruno@clisp.org> + + thread: Fix test link error on DragonFly BSD 6.0. + * lib/glthread/thread.c (gl_thread_create): Moved to here... + * lib/glthread/thread.h (gl_thread_create): ...from here. + (_GLTHREAD_THREAD_INLINE): Remove macro. + Remove _GL_INLINE_HEADER_BEGIN/END invocations. + 2021-06-06 Bruno Haible <bruno@clisp.org> sigsegv: Avoid a gcc warning "declaration of 'sig' shadows a parameter". diff --git a/lib/glthread/thread.c b/lib/glthread/thread.c index 38ba85d732..de449329de 100644 --- a/lib/glthread/thread.c +++ b/lib/glthread/thread.c @@ -20,7 +20,6 @@ #include <config.h> /* Specification. */ -# define _GLTHREAD_THREAD_INLINE _GL_EXTERN_INLINE #include "glthread/thread.h" #include <stdlib.h> @@ -203,3 +202,15 @@ const gl_thread_t gl_null_thread /* = { .p = NULL } */; #endif /* ========================================================================= */ + +gl_thread_t +gl_thread_create (void *(*func) (void *arg), void *arg) +{ + gl_thread_t thread; + int ret; + + ret = glthread_create (&thread, func, arg); + if (ret != 0) + abort (); + return thread; +} diff --git a/lib/glthread/thread.h b/lib/glthread/thread.h index 1de9dcb4ba..3e84599f5a 100644 --- a/lib/glthread/thread.h +++ b/lib/glthread/thread.h @@ -83,14 +83,6 @@ # endif #endif -#ifndef _GL_INLINE_HEADER_BEGIN - #error "Please include config.h first." -#endif -_GL_INLINE_HEADER_BEGIN -#ifndef _GLTHREAD_THREAD_INLINE -# define _GLTHREAD_THREAD_INLINE _GL_INLINE -#endif - /* ========================================================================= */ #if USE_ISOC_THREADS @@ -314,17 +306,7 @@ typedef int gl_thread_t; extern "C" { #endif -_GLTHREAD_THREAD_INLINE gl_thread_t -gl_thread_create (void *(*func) (void *arg), void *arg) -{ - gl_thread_t thread; - int ret; - - ret = glthread_create (&thread, func, arg); - if (ret != 0) - abort (); - return thread; -} +extern gl_thread_t gl_thread_create (void *(*func) (void *arg), void *arg); #define gl_thread_sigmask(HOW, SET, OSET) \ do \ { \ @@ -351,6 +333,4 @@ gl_thread_create (void *(*func) (void *arg), void *arg) } #endif -_GL_INLINE_HEADER_END - #endif /* _GLTHREAD_THREAD_H */ |