X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7d2564bf6ec7a7135175eb4eeeba1e190139203c..eff2324504a9161166f095f4fe512a122da6854e:/src/portable.h

diff --git a/src/portable.h b/src/portable.h
index 823409cf09..57d6a16dd6 100644
--- a/src/portable.h
+++ b/src/portable.h
@@ -1,9 +1,8 @@
-/* $Id$ */
-
 /* portable -- header loading to write portable code                         */
 /* loads much more stuff than sysdep.h since the latter is in public interface*/
 
-/* Copyright (c) 2004 Martin Quinson. All rights reserved.                   */
+/* Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, 2010. The SimGrid Team.
+ * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
   * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -11,16 +10,14 @@
 #ifndef GRAS_PORTABLE_H
 #define GRAS_PORTABLE_H
 
-#include "simgrid_config.h"
+#include "gras_config.h"
 #include "xbt/misc.h"
 /* 
- * win32 or win64 (__WIN32 is defined for win32 and win64 applications, __TOS_WIN__ is defined by xlC).	
+ * win32 or win64 (__XBT_WIN32 is defined for win32 and win64 applications, __TOS_WIN__ is defined by xlC).
 */
-#ifdef _WIN32
+#ifdef _XBT_WIN32
 # include "win32/config.h"
 # include <windows.h>
-#else
-#  include "gras_config.h"
 #endif
 
 #include <stdarg.h>
@@ -155,5 +152,4 @@ XBT_PUBLIC(int) vsnprintf(char *, size_t, const char *, va_list);
      void hexa_print(const char *name, unsigned char *data, int size);
      const char *hexa_str(unsigned char *data, int size, int downside);
 
-#include "simgrid_config.h"
 #endif /* GRAS_PORTABLE_H */