X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/280670eff128291d00a30689bdbbd986f7b0a773..e23b481e91e2c7020856a88e25cb6f4fe1358e1f:/src/portable.h

diff --git a/src/portable.h b/src/portable.h
index b166e2cd9f..cb5bc991aa 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,26 +10,18 @@
 #ifndef GRAS_PORTABLE_H
 #define GRAS_PORTABLE_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
-
-/* Load this asap to make sure that GNU_SOURCE is defined on need when stdio gets loaded by some random system header */
-#ifdef HAVE_GETLINE
-#  ifndef _GNU_SOUCE
-#    define _GNU_SOURCE
-#  endif
-#  include <stdio.h>
 #endif
 
 #include <stdarg.h>
+#include <stdio.h>
 
 #ifdef HAVE_ERRNO_H
 #  include <errno.h>
@@ -162,5 +153,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 */