diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | nptl/tst-cancel-self-cancelstate.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index f43cb09c9f..0797a15123 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2014-11-26 Joseph Myers <joseph@codesourcery.com> + * nptl/tst-cancel-self-cancelstate.c (do_test): Cast argument of + pthread_cleanup_push to void *. + * sysdeps/unix/sysv/linux/arm/libc-do-syscall.S (_FORTIFY_SOURCE): Undefine. diff --git a/nptl/tst-cancel-self-cancelstate.c b/nptl/tst-cancel-self-cancelstate.c index 3dce967e8f..0defd0b425 100644 --- a/nptl/tst-cancel-self-cancelstate.c +++ b/nptl/tst-cancel-self-cancelstate.c @@ -29,7 +29,7 @@ do_test (void) int ret = 0; volatile int should_fail = 1; - pthread_cleanup_push (cleanup, &should_fail); + pthread_cleanup_push (cleanup, (void *) &should_fail); if ((ret = pthread_setcancelstate (PTHREAD_CANCEL_DISABLE, NULL)) != 0) { |