From 5f0441a0bef4d7a8af4e3ba8b24a948e5cccd71c Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Thu, 9 Jun 2011 12:55:09 +0200 Subject: [PATCH 1/1] thread: Fix confusion between NULL and 0. * lib/glthread/thread.h (gl_thread_self): Use NULL and 0 appropriately. Reported by Paul Eggert. --- ChangeLog | 6 ++++++ lib/glthread/thread.h | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 016a55869..57813f105 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2011-06-09 Bruno Haible + thread: Fix confusion between NULL and 0. + * lib/glthread/thread.h (gl_thread_self): Use NULL and 0 appropriately. + Reported by Paul Eggert. + +2011-06-09 Bruno Haible + spawn-pipe tests: Avoid test failure on HP-UX 11. * tests/test-spawn-pipe-child.c (main) [HP-UX]: Don't assert that fd 2 is closed. diff --git a/lib/glthread/thread.h b/lib/glthread/thread.h index 5d7204073..a0d40f8eb 100644 --- a/lib/glthread/thread.h +++ b/lib/glthread/thread.h @@ -205,7 +205,7 @@ typedef pth_t gl_thread_t; # define glthread_join(THREAD, RETVALP) \ (pth_in_use () && !pth_join (THREAD, RETVALP) ? errno : 0) # define gl_thread_self() \ - (pth_in_use () ? (void *) pth_self () : 0) + (pth_in_use () ? (void *) pth_self () : NULL) # define gl_thread_exit(RETVAL) \ (pth_in_use () ? pth_exit (RETVAL) : 0) # define glthread_atfork(PREPARE_FUNC, PARENT_FUNC, CHILD_FUNC) 0 @@ -257,7 +257,7 @@ typedef thread_t gl_thread_t; # define glthread_join(THREAD, RETVALP) \ (thread_in_use () ? thr_join (THREAD, NULL, RETVALP) : 0) # define gl_thread_self() \ - (thread_in_use () ? (void *) thr_self () : 0) + (thread_in_use () ? (void *) thr_self () : NULL) # define gl_thread_exit(RETVAL) \ (thread_in_use () ? thr_exit (RETVAL) : 0) # define glthread_atfork(PREPARE_FUNC, PARENT_FUNC, CHILD_FUNC) 0 @@ -322,7 +322,7 @@ typedef int gl_thread_t; # define glthread_create(THREADP, FUNC, ARG) ENOSYS # define glthread_sigmask(HOW, SET, OSET) 0 # define glthread_join(THREAD, RETVALP) 0 -# define gl_thread_self() NULL +# define gl_thread_self() 0 # define gl_thread_exit(RETVAL) 0 # define glthread_atfork(PREPARE_FUNC, PARENT_FUNC, CHILD_FUNC) 0 -- 2.11.0