update

[l4.git] / l4 / pkg / valgrind / src / valgrind-3.6.0-svn / drd / tests / tsan_unittest.cpp

diff --git a/l4/pkg/valgrind/src/valgrind-3.6.0-svn/drd/tests/tsan_unittest.cpp b/l4/pkg/valgrind/src/valgrind-3.6.0-svn/drd/tests/tsan_unittest.cpp
index 6ba123d7626a10988e3eda43004a4c6253d9951b..1ff34b72cc26dcee2ca452e8cc7fe91d420093b4 100644 (file)
--- a/l4/pkg/valgrind/src/valgrind-3.6.0-svn/drd/tests/tsan_unittest.cpp
+++ b/l4/pkg/valgrind/src/valgrind-3.6.0-svn/drd/tests/tsan_unittest.cpp
@@ -93,7 +93,7 @@ static inline void IGNORE_RETURN_VALUE(T v)
 #include <stdlib.h>
 #include <dirent.h>
 
-#ifndef __APPLE__
+#ifndef VGO_darwin
 #include <malloc.h>
 #endif
 
@@ -3469,7 +3469,7 @@ void Worker() {
   n %= Nlog;
 
   long t0 = clock();
-  long t = t0;
+  long t __attribute__((unused)) = t0;
 
   for (int it = 0; it < N_iter; it++) {
     if(n == 0) {
@@ -4786,7 +4786,7 @@ void Run() {
   // but the files are actually the same (symlinked).
   sprintf(out_name, "/tmp/racecheck_unittest_out.%d", getpid());
   fd_out = creat(out_name, O_WRONLY | S_IRWXU);
-#ifdef __APPLE__
+#ifdef VGO_darwin
   // symlink() is not supported on Darwin. Copy the output file name.
   strcpy(in_name, out_name);
 #else
@@ -5047,7 +5047,7 @@ namespace test105 {
 int     GLOB = 0;
 
 void F1() {
-  int ar[32];
+  int ar[32] __attribute__((unused));
 //  ANNOTATE_TRACE_MEMORY(&ar[0]);
 //  ANNOTATE_TRACE_MEMORY(&ar[31]);
   ar[0] = 1;
@@ -5055,7 +5055,7 @@ void F1() {
 }
 
 void Worker() {
-  int ar[32];
+  int ar[32] __attribute__((unused));
 //  ANNOTATE_TRACE_MEMORY(&ar[0]);
 //  ANNOTATE_TRACE_MEMORY(&ar[31]);
   ar[0] = 1;
@@ -7142,7 +7142,7 @@ BlockingCounter *blocking_counter;
 int     GLOB = 0;
 
 // Worker(N) will do 2^N increments of GLOB, each increment in a separate thread
-void Worker(int depth) {
+void Worker(long depth) {
   CHECK(depth >= 0);
   if (depth > 0) {
     ThreadPool pool(2);