Define correctly variables for windows.

[simgrid.git] / tools / tesh2 / src / fstream.c

diff --git a/tools/tesh2/src/fstream.c b/tools/tesh2/src/fstream.c
index 313717f..f0e3911 100644 (file)
--- a/tools/tesh2/src/fstream.c
+++ b/tools/tesh2/src/fstream.c
@@ -25,11 +25,11 @@
 #include <is_cmd.h>\r
 #include <getpath.h>\r
 \r
-#ifndef WIN32\r
+#ifndef _XBT_WIN32\r
 #include <xsignal.h>\r
 #endif\r
 \r
-#ifdef WIN32\r
+#ifdef _XBT_WIN32\r
 static int\r
 is_w32_cmd(char* cmd, char** path)\r
 {\r
@@ -181,7 +181,7 @@ fstream_open(fstream_t fstream)
                return 0;\r
        }\r
        \r
-       #ifndef WIN32\r
+       #ifndef _XBT_WIN32\r
        sprintf(path,"%s/%s",fstream->directory, fstream->name);\r
        #else\r
        sprintf(path,"%s\\%s",fstream->directory, fstream->name);\r
@@ -329,14 +329,14 @@ fstream_parse(fstream_t fstream, xbt_os_mutex_t mutex)
                                \r
                        if(context->command_line)\r
                        {\r
-                               #ifdef WIN32\r
+                               #ifdef _XBT_WIN32\r
                                if(!context->is_not_found)\r
                                {\r
                                #endif\r
                                if(fstream_launch_command(fstream, context, mutex) < 0)\r
                                                break;\r
 \r
-                               #ifdef WIN32\r
+                               #ifdef _XBT_WIN32\r
                                }\r
                                #endif\r
                        }\r
@@ -384,7 +384,7 @@ fstream_parse(fstream_t fstream, xbt_os_mutex_t mutex)
        /* Check that last command of the file ran well */\r
        if(context->command_line)\r
        {\r
-               #ifdef WIN32\r
+               #ifdef _XBT_WIN32\r
                if(!context->is_not_found)\r
                {\r
                #endif\r
@@ -392,7 +392,7 @@ fstream_parse(fstream_t fstream, xbt_os_mutex_t mutex)
                if(fstream_launch_command(fstream, context, mutex) < 0)\r
                        return -1;\r
 \r
-               #ifdef WIN32\r
+               #ifdef _XBT_WIN32\r
                }\r
                #endif\r
        }\r
@@ -1282,7 +1282,7 @@ fstream_process_token(fstream_t fstream, context_t context, xbt_os_mutex_t mutex
                context->line = /*strdup(filepos)*/ filepos;\r
                context->pos = strdup(filepos);\r
                \r
-               #ifdef WIN32\r
+               #ifdef _XBT_WIN32\r
                {\r
 \r
                /* translate the command line */\r
@@ -1484,7 +1484,7 @@ fstream_process_token(fstream_t fstream, context_t context, xbt_os_mutex_t mutex
                        \r
                        xbt_str_trim(context->signal," \n");\r
 \r
-                       #ifdef WIN32\r
+                       #ifdef _XBT_WIN32\r
                        if(!strstr("SIGSEGVSIGTRAPSIGBUSSIGFPESIGILL", context->signal))\r
                        {\r
                                ERROR2("[%s] Signal `%s' not supported by this platform", filepos, context->signal);\r
@@ -1685,7 +1685,7 @@ fstream_process_token(fstream_t fstream, context_t context, xbt_os_mutex_t mutex
                        {\r
                                if(exists)\r
                                {\r
-                                       #ifndef WIN32\r
+                                       #ifndef _XBT_WIN32\r
                                        unsetenv(name);\r
                                        #else\r
                                        SetEnvironmentVariable(name, NULL);\r
@@ -1816,7 +1816,7 @@ fstream_process_token(fstream_t fstream, context_t context, xbt_os_mutex_t mutex
                                                free(variable->val);\r
                                                variable->val = strdup(val);\r
 \r
-                                               #ifdef WIN32\r
+                                               #ifdef _XBT_WIN32\r
                                                SetEnvironmentVariable(variable->name, variable->val);\r
                                                #else\r
                                                setenv(variable->name, variable->val, 1);\r
@@ -1853,7 +1853,7 @@ fstream_process_token(fstream_t fstream, context_t context, xbt_os_mutex_t mutex
                                                \r
                                                xbt_dynar_push(unit->runner->variables, &variable);\r
                                                \r
-                                               #ifdef WIN32\r
+                                               #ifdef _XBT_WIN32\r
                                                SetEnvironmentVariable(variable->name, variable->val);\r
                                                #else\r
                                                setenv(variable->name, variable->val, 0);\r