Merge from V6_main (04/10/2012)

[modules/kernel.git] / src / SALOMETraceCollector / Test / SALOMETraceCollectorTest.cxx

diff --git a/src/SALOMETraceCollector/Test/SALOMETraceCollectorTest.cxx b/src/SALOMETraceCollector/Test/SALOMETraceCollectorTest.cxx
index 61c0ee91bcf611f34f616c346956c9298d4d1ab3..4a448f8baccd50382b4673b9200858f8b80711a2 100644 (file)
--- a/src/SALOMETraceCollector/Test/SALOMETraceCollectorTest.cxx
+++ b/src/SALOMETraceCollector/Test/SALOMETraceCollectorTest.cxx
@@ -28,7 +28,11 @@
 #include <cstdlib>
 #include "LocalTraceBufferPool.hxx"
 #include "utilities.h"
+#include "Basics_Utils.hxx"
 
+#ifdef WIN32
+#define setenv Kernel_Utils::setenv
+#endif 
 
 // ============================================================================
 /*!
@@ -109,4 +113,7 @@ void *PrintHello(void *threadid)
                 << " - iter " << i);
 #endif
   pthread_exit(NULL);
+  #ifdef WIN32\r
+    return NULL;\r
+  #endif
 }