* sysdeps/pthread/pthread.h (pthread_cleanup_push,

	pthread_cleanup_push_defer_np): Add extra (void *) cast to shut up
	g++ 4.1 and 4.2 -Wstrict-aliasing warnings.

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index c5019e4..c147c18 100644 (file)
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,9 @@
+2007-11-20  Jakub Jelinek  <jakub@redhat.com>
+
+       * sysdeps/pthread/pthread.h (pthread_cleanup_push,
+       pthread_cleanup_push_defer_np): Add extra (void *) cast to shut up
+       g++ 4.1 and 4.2 -Wstrict-aliasing warnings.
+
 2007-11-08  Ulrich Drepper  <drepper@redhat.com>
 
        [BZ #5240]

diff --git a/nptl/sysdeps/pthread/pthread.h b/nptl/sysdeps/pthread/pthread.h
index d175f31..59126fc 100644 (file)
--- a/nptl/sysdeps/pthread/pthread.h
+++ b/nptl/sysdeps/pthread/pthread.h
@@ -638,7 +638,7 @@ __pthread_cleanup_routine (struct __pthread_cleanup_frame *__frame)
     __pthread_unwind_buf_t __cancel_buf;                                     \
     void (*__cancel_routine) (void *) = (routine);                           \
     void *__cancel_arg = (arg);                                                      \
-    int not_first_call = __sigsetjmp ((struct __jmp_buf_tag *)               \
+    int not_first_call = __sigsetjmp ((struct __jmp_buf_tag *) (void *)              \
                                      __cancel_buf.__cancel_jmp_buf, 0);      \
     if (__builtin_expect (not_first_call, 0))                                \
       {                                                                              \
@@ -672,7 +672,7 @@ extern void __pthread_unregister_cancel (__pthread_unwind_buf_t *__buf)
     __pthread_unwind_buf_t __cancel_buf;                                     \
     void (*__cancel_routine) (void *) = (routine);                           \
     void *__cancel_arg = (arg);                                                      \
-    int not_first_call = __sigsetjmp ((struct __jmp_buf_tag *)               \
+    int not_first_call = __sigsetjmp ((struct __jmp_buf_tag *) (void *)              \
                                      __cancel_buf.__cancel_jmp_buf, 0);      \
     if (__builtin_expect (not_first_call, 0))                                \
       {                                                                              \