This one was not ours.

[simgrid.git] / teshsuite / smpi / mpich3-test / util / mtest.c

diff --git a/teshsuite/smpi/mpich3-test/util/mtest.c b/teshsuite/smpi/mpich3-test/util/mtest.c
index 0fd3032..a13d88c 100644 (file)
--- a/teshsuite/smpi/mpich3-test/util/mtest.c
+++ b/teshsuite/smpi/mpich3-test/util/mtest.c
@@ -242,7 +242,7 @@ int MTestReturnValue( int errors )
  * from the tests.
  * MTestSleep( seconds )
  */
-#ifdef HAVE_WINDOWS_H
+#ifdef _WIN32
 #include <windows.h>
 void MTestSleep( int sec )
 {
@@ -546,14 +546,13 @@ static void *MTestTypeIndexedInitRecv( MTestDatatype *mtype )
 
 static void *MTestTypeIndexedFree( MTestDatatype *mtype )
 {
-    if (mtype->buf) {
-       free( mtype->buf );
+    if (mtype->buf) 
+      free( mtype->buf );
        free( mtype->displs );
        free( mtype->index );
        mtype->buf    = 0;
        mtype->displs = 0;
        mtype->index  = 0;
-    }
     return 0;
 }
 
@@ -971,10 +970,10 @@ const char *MTestGetDatatypeName( MTestDatatype *dtype )
  * that return value as well.
  * 
  */
-static __thread int interCommIdx = 0;
-static __thread int intraCommIdx = 0;
-static __thread const char *intraCommName = 0;
-static __thread const char *interCommName = 0;
+static int interCommIdx = 0;
+static int intraCommIdx = 0;
+static const char *intraCommName = 0;
+static const char *interCommName = 0;
 
 /* 
  * Get an intracommunicator with at least min_size members.  If "allowSmaller"
@@ -1459,7 +1458,7 @@ const char *MTestGetIntercommName( void )
 int MTestGetComm( MPI_Comm *comm, int min_size )
 {
     int idx=0;
-    static __thread int getinter = 0;
+    static int getinter = 0;
 
     if (!getinter) {
        idx = MTestGetIntracomm( comm, min_size );
@@ -1541,7 +1540,7 @@ static void MTestResourceSummary( FILE *fp )
 {
 #ifdef HAVE_GETRUSAGE
     struct rusage ru;
-    static __thread int pfThreshold = -2;
+    static int pfThreshold = -2;
     int doOutput = 1;
     if (getrusage( RUSAGE_SELF, &ru ) == 0) {
        /* There is an option to generate output only when a resource
@@ -1582,11 +1581,11 @@ static void MTestResourceSummary( FILE *fp )
 /*
  * Create MPI Windows
  */
-static __thread int win_index = 0;
+static int win_index = 0;
 static const char *winName;
 /* Use an attribute to remember the type of memory allocation (static,
    malloc, or MPI_Alloc_mem) */
-static __thread int mem_keyval = MPI_KEYVAL_INVALID;
+static int mem_keyval = MPI_KEYVAL_INVALID;
 int MTestGetWin( MPI_Win *win, int mustBePassive )
 {
     static char actbuf[1024];