A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated ChangeLog.
[simgrid.git]
/
src
/
portable.h
diff --git
a/src/portable.h
b/src/portable.h
index
669bd2b
..
57d6a16
100644
(file)
--- 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*/
/* 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. */
/* 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,23
+10,14
@@
#ifndef GRAS_PORTABLE_H
#define GRAS_PORTABLE_H
#ifndef GRAS_PORTABLE_H
#define GRAS_PORTABLE_H
+#include "gras_config.h"
#include "xbt/misc.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>
# 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>
#endif
#include <stdarg.h>