Fix 'implicit declaration of pthread_sigmask' compiler warning

(fix commit 1554297)

* include/gc_pthread_redirects.h [GC_NO_PTHREAD_SIGMASK]: Include
signal.h even GC_pthread_sigmask is not declared (otherwise
pthread_sigmask is redefined to GC_pthread_sigmask first and then
signal.h is included thus causing REAL(pthread_sigmask) to stay
undefined).
* include/gc_pthread_redirects.h [GC_NO_PTHREAD_SIGMASK]
(GC_pthread_sigmask): Define it also if _BSD_SOURCE or _GNU_SOURCE.
* tests/test.c [CPPCHECK] (GC_PTHREAD_SIGMASK_NEEDED): Do not define
(because defining _GNU_SOURCE is sufficient to have GC_pthread_sigmask
declared).
* tests/test.c [CPPCHECK] (_GNU_SOURCE): Do not define unless GC_PTHREADS.

diff --git a/include/gc_pthread_redirects.h b/include/gc_pthread_redirects.h
index 4e7964bd08118c9e37e81a1a1eab4501b42935a8..8dcf7ebf6a5221855426f5d177e38dba556716a7 100644 (file)
--- a/include/gc_pthread_redirects.h
+++ b/include/gc_pthread_redirects.h
@@ -42,12 +42,14 @@
     GC_API void *GC_dlopen(const char * /* path */, int /* mode */);
 # endif /* !GC_NO_DLOPEN */
 
-# if !defined(GC_NO_PTHREAD_SIGMASK) \
-     && (defined(GC_PTHREAD_SIGMASK_NEEDED) \
-         || _POSIX_C_SOURCE >= 199506L || _XOPEN_SOURCE >= 500)
-#   include <signal.h>
-    GC_API int GC_pthread_sigmask(int /* how */, const sigset_t *,
-                                  sigset_t * /* oset */);
+# ifndef GC_NO_PTHREAD_SIGMASK
+#   include <signal.h>  /* needed anyway for proper redirection */
+#   if defined(GC_PTHREAD_SIGMASK_NEEDED) \
+        || defined(_BSD_SOURCE) || defined(_GNU_SOURCE) \
+        || (_POSIX_C_SOURCE >= 199506L) || (_XOPEN_SOURCE >= 500)
+      GC_API int GC_pthread_sigmask(int /* how */, const sigset_t *,
+                                    sigset_t * /* oset */);
+#   endif
 # endif /* !GC_NO_PTHREAD_SIGMASK */
 
 # ifndef GC_PTHREAD_CREATE_CONST

diff --git a/tests/test.c b/tests/test.c
index c6a9e86066fe25ee83fb50a812496ea58e6823c0..87574aad6fcc092a973fd408197edb5179674eef 100644 (file)
--- a/tests/test.c
+++ b/tests/test.c
@@ -29,11 +29,8 @@
 #  define GC_DEBUG
 #endif
 
-#ifdef CPPCHECK
-# define GC_PTHREAD_SIGMASK_NEEDED
-# ifndef _GNU_SOURCE
-#   define _GNU_SOURCE 1
-# endif
+#if defined(CPPCHECK) && defined(GC_PTHREADS) && !defined(_GNU_SOURCE)
+# define _GNU_SOURCE 1
 #endif
 #undef GC_NO_THREAD_REDIRECTS
 #include "gc.h"