diff options
| -rw-r--r-- | nptl/ChangeLog | 7 | ||||
| -rw-r--r-- | nptl/tst-cancel7.c | 4 | ||||
| -rw-r--r-- | nptl/tst-mutex6.c | 5 | ||||
| -rw-r--r-- | nptl/tst-mutex9.c | 4 | ||||
| -rw-r--r-- | nptl/tst-mutexpi6.c | 6 |
5 files changed, 17 insertions, 9 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog index 7b0676381b..f4b2f04c0c 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,10 @@ +2011-10-24 Ulrich Drepper <drepper@gmail.com> + + * tst-cancel7.c: Avoid warning. + * tst-mutex6.c: Likewise. + * tst-mutex9.c: Likewise. + * tst-mutexpi6.c: Likewise. + 2011-10-23 Ulrich Drepper <drepper@gmail.com> * sysdeps/i386/tls.h: Remove #include <list.h>. diff --git a/nptl/tst-cancel7.c b/nptl/tst-cancel7.c index be9b1c6064..af0d18f1ec 100644 --- a/nptl/tst-cancel7.c +++ b/nptl/tst-cancel7.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2002, 2003 Free Software Foundation, Inc. +/* Copyright (C) 2002, 2003, 2011 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Jakub Jelinek <jakub@redhat.com>, 2002. @@ -204,7 +204,7 @@ do_cleanup (void) case OPT_PIDFILE: \ pidfile = optarg; \ break; -// #define CLEANUP_HANDLER do_cleanup () +#define CLEANUP_HANDLER do_cleanup () #define PREPARE(argc, argv) do_prepare (argc, argv) #define TEST_FUNCTION do_test () #define TIMEOUT 5 diff --git a/nptl/tst-mutex6.c b/nptl/tst-mutex6.c index de64bdb435..19611ee94b 100644 --- a/nptl/tst-mutex6.c +++ b/nptl/tst-mutex6.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2002, 2006 Free Software Foundation, Inc. +/* Copyright (C) 2002, 2006, 2011 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2002. @@ -25,7 +25,8 @@ #ifndef ATTR -# define ATTR NULL +pthread_mutexattr_t *attr; +# define ATTR attr #endif diff --git a/nptl/tst-mutex9.c b/nptl/tst-mutex9.c index f9d379343d..bdf1dc8420 100644 --- a/nptl/tst-mutex9.c +++ b/nptl/tst-mutex9.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2003, 2004, 2006 Free Software Foundation, Inc. +/* Copyright (C) 2003, 2004, 2006, 2011 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2003. @@ -37,7 +37,6 @@ do_test (void) pthread_mutex_t *m; pthread_mutexattr_t a; pid_t pid; - char *p; fd = mkstemp (tmpfname); if (fd == -1) @@ -68,7 +67,6 @@ do_test (void) m = (pthread_mutex_t *) (((uintptr_t) mem + __alignof (pthread_mutex_t)) & ~(__alignof (pthread_mutex_t) - 1)); - p = (char *) (m + 1); if (pthread_mutexattr_init (&a) != 0) { diff --git a/nptl/tst-mutexpi6.c b/nptl/tst-mutexpi6.c index 42cda377d1..8881a1d2c0 100644 --- a/nptl/tst-mutexpi6.c +++ b/nptl/tst-mutexpi6.c @@ -3,11 +3,13 @@ #include <stdlib.h> -static pthread_mutexattr_t a; +pthread_mutexattr_t a; +pthread_mutexattr_t *attr; static void prepare (void) { + attr = &a; if (pthread_mutexattr_init (&a) != 0) { puts ("mutexattr_init failed"); @@ -23,5 +25,5 @@ prepare (void) #define PREPARE(argc, argv) prepare () -#define ATTR &a +#define ATTR attr #include "tst-mutex6.c" |