From d9e1d5c10de9683656d0010ef4674d6eaad631f1 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Mon, 5 Oct 2020 11:04:33 -0700 Subject: [PATCH] thread: pacify GCC on Solaris 10 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Problem reported by Kiyoshi KANAZAWA for grep (Bug#43666#29). * lib/glthread/thread.h (gl_thread_self): Use ‘(pthread_t) 0’ instead of ‘(pthread_t) NULL’, to pacify GCC on Solaris 10 where pthread_t is unsigned int. --- ChangeLog | 8 ++++++++ lib/glthread/thread.h | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 4ec03efe43..875f3551ad 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2020-10-05 Paul Eggert + + thread: pacify GCC on Solaris 10 + Problem reported by Kiyoshi KANAZAWA for grep (Bug#43666#29). + * lib/glthread/thread.h (gl_thread_self): Use ‘(pthread_t) 0’ + instead of ‘(pthread_t) NULL’, to pacify GCC on Solaris 10 + where pthread_t is unsigned int. + 2020-10-04 Paul Eggert c-stack: avoid AS_IF diff --git a/lib/glthread/thread.h b/lib/glthread/thread.h index 4077b45187..403de34b2a 100644 --- a/lib/glthread/thread.h +++ b/lib/glthread/thread.h @@ -232,7 +232,7 @@ extern const gl_thread_t gl_null_thread; extern const gl_thread_t gl_null_thread; # else # define gl_thread_self() \ - (pthread_in_use () ? pthread_self () : (pthread_t) NULL) + (pthread_in_use () ? pthread_self () : (pthread_t) 0) # define gl_thread_self_pointer() \ (pthread_in_use () ? (void *) pthread_self () : NULL) # endif -- 2.39.5