Be compatible with windows

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@8380 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/include/xbt/log.h b/include/xbt/log.h
index 83a4fed..e51c491 100644 (file)
--- a/include/xbt/log.h
+++ b/include/xbt/log.h
@@ -28,12 +28,12 @@
 /* XBT_LOG_MAYDAY: define this to replace the logging facilities with basic
    printf function. Useful to debug the logging facilities themselves */
 #undef XBT_LOG_MAYDAY
-/*#define XBT_LOG_MAYDAY*/
+//#define XBT_LOG_MAYDAY
 
 #ifndef _XBT_LOG_H_
 #define _XBT_LOG_H_
 
-#include "xbt/misc.h"
+#include "simgrid_config.h"
 
 #include <stdarg.h>
 SG_BEGIN_DECL()

diff --git a/include/xbt/setset.h b/include/xbt/setset.h
index 1ae94cb..140c016 100644 (file)
--- a/include/xbt/setset.h
+++ b/include/xbt/setset.h
@@ -74,4 +74,4 @@ void xbt_setset_cursor_next(xbt_setset_cursor_t cursor);
               xbt_setset_cursor_get_data(cursor, (void **)&data); \
               xbt_setset_cursor_next(cursor))  
 
-#endif
\ No newline at end of file
+#endif

diff --git a/tools/tesh/tesh.c b/tools/tesh/tesh.c
index 27a658a..0a495b8 100644 (file)
--- a/tools/tesh/tesh.c
+++ b/tools/tesh/tesh.c
@@ -84,7 +84,7 @@ static void handle_line(const char *filepos, char *line)
   }
 }
 
-static void handle_suite(const char *filename, FILE * IN)
+static void handle_suite(const char *filename, FILE * FICIN)
 {
   size_t len;
   int blankline;
@@ -99,7 +99,7 @@ static void handle_suite(const char *filename, FILE * IN)
   buff = xbt_strbuff_new();
   rctx = rctx_new();
 
-  while (getline(&line, &len, IN) != -1) {
+  while (getline(&line, &len, FICIN) != -1) {
     line_num++;
 
     /* Count the line length while checking wheather it's blank */
@@ -189,7 +189,7 @@ static void parse_environ()
 
 int main(int argc, char *argv[])
 {
-  FILE *IN = NULL;
+  FILE *FICIN = NULL;
   int i;
   char *suitename = NULL;
 
@@ -243,15 +243,15 @@ int main(int argc, char *argv[])
 
       INFO1("Test suite `%s'", suitename);
       testsuite_name = suitename;
-      IN = fopen(argv[i], "r");
-      if (!IN) {
+      FICIN = fopen(argv[i], "r");
+      if (!FICIN) {
         perror(bprintf("Impossible to open the suite file `%s'", argv[i]));
         ERROR1("Test suite `%s': NOK (system error)", testsuite_name);
         rctx_armageddon(rctx, 1);
       }
-      handle_suite(suitename, IN);
+      handle_suite(suitename, FICIN);
       rctx_wait_bg();
-      fclose(IN);
+      fclose(FICIN);
       INFO1("Test suite `%s' OK", suitename);
       free(suitename);
     }