diff options
| author | Michael Heimpold <mhei@heimpold.de> | 2014-12-22 11:12:12 +0800 |
|---|---|---|
| committer | Daniel Veillard <veillard@redhat.com> | 2014-12-22 11:12:12 +0800 |
| commit | fff8a6b87e05200a0ad0af6f86c2e859c7de9172 (patch) | |
| tree | 4f45b3284684e7567afa87ef243c8d742a2ec874 | |
| parent | f54d6a929af2a570396f0595a0e29064c908c12e (diff) | |
| download | libxml2-fff8a6b87e05200a0ad0af6f86c2e859c7de9172.tar.gz | |
threads: use forward declarations only for glibc
Fixes bug #704908
The declarations of pthread functions, used to generate weak references
to them, fail to suppress macros. Thus, if any pthread function has
been provided as a macro, compiling threads.c will fail.
This breaks on musl libc, which defines pthread_equal as a macro (in
addition to providing the function, as required).
Prevent the declarations for e.g. musl libc by refining the condition.
The idea for this solution was borrowed from the alpine linux guys, see
http://git.alpinelinux.org/cgit/aports/tree/main/libxml2/libxml2-pthread.patch
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
| -rw-r--r-- | threads.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -47,7 +47,7 @@ #ifdef HAVE_PTHREAD_H static int libxml_is_threaded = -1; -#ifdef __GNUC__ +#if defined(__GNUC__) && defined(__GLIBC__) #ifdef linux #if (__GNUC__ == 3 && __GNUC_MINOR__ >= 3) || (__GNUC__ > 3) extern int pthread_once (pthread_once_t *__once_control, @@ -89,7 +89,7 @@ extern int pthread_cond_signal () __attribute((weak)); #endif #endif /* linux */ -#endif /* __GNUC__ */ +#endif /* defined(__GNUC__) && defined(__GLIBC__) */ #endif /* HAVE_PTHREAD_H */ /* |