Merge from trunk, r15975 (Avoid unused variable warning.)

git-svn-id: svn://svn.valgrind.org/valgrind/branches/VALGRIND_3_12_BRANCH@16007

diff --git a/helgrind/tests/bar_bad.c b/helgrind/tests/bar_bad.c
index 8ead816e173b07bebc8964fa1d6075220d47ea5f..19cf81c1daea2899c57c7e33c623fc593ad81ba9 100644 (file)
--- a/helgrind/tests/bar_bad.c
+++ b/helgrind/tests/bar_bad.c
@@ -34,7 +34,7 @@ void *exit1 ( void* arg )
 int main ( void )
 {
   pthread_barrier_t *bar1, *bar2, *bar3, *bar4, *bar5;
-  int r;
+  /* int r; unused since pthread_cancel are commented out */
   pthread_t thr1, thr2, slp1, slp2, ext1;
 
   /* initialise a barrier with a zero count */