From 268981d54533fb025d1353582cf229d235eb2fb2 Mon Sep 17 00:00:00 2001
From: alegrand <alegrand@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Thu, 30 Mar 2006 20:17:32 +0000
Subject: [PATCH] finer inclusion of sysdep.h

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@2020 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---
 examples/msg/msg_test.c         | 2 ++
 examples/msg/msg_test_suspend.c | 2 +-
 include/msg/msg.h               | 1 -
 include/surf/surfxml_parse.h    | 1 +
 include/xbt/ex.h                | 2 +-
 include/xbt/swag.h              | 3 +--
 src/xbt/graphxml_parse.c        | 1 +
 7 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/examples/msg/msg_test.c b/examples/msg/msg_test.c
index 826a9efdc8..e692d0a137 100644
--- a/examples/msg/msg_test.c
+++ b/examples/msg/msg_test.c
@@ -6,9 +6,11 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "msg/msg.h" /* Yeah! If you want to use msg, you need to include msg/msg.h */
+#include "xbt/sysdep.h" /* calloc, printf */
 
 /* Create a log channel to have nice outputs. */
 #include "xbt/log.h"
+#include "xbt/asserts.h"
 XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test,"Messages specific for this msg example");
 
 int master(int argc, char *argv[]);
diff --git a/examples/msg/msg_test_suspend.c b/examples/msg/msg_test_suspend.c
index e1119a82ef..13925749c6 100644
--- a/examples/msg/msg_test_suspend.c
+++ b/examples/msg/msg_test_suspend.c
@@ -6,7 +6,7 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "msg/msg.h" /* Yeah! If you want to use msg, you need to include msg/msg.h */
-
+#include "xbt/sysdep.h" /* calloc, printf */
 
 /* Create a log channel to have nice outputs. */
 #include "xbt/log.h"
diff --git a/include/msg/msg.h b/include/msg/msg.h
index 4a570b6adb..cd8b1a1d40 100644
--- a/include/msg/msg.h
+++ b/include/msg/msg.h
@@ -9,7 +9,6 @@
 #define MSG_H
 
 #include "xbt/misc.h"
-#include "xbt/sysdep.h"
 
 #include "msg/datatypes.h"
 SG_BEGIN_DECL()
diff --git a/include/surf/surfxml_parse.h b/include/surf/surfxml_parse.h
index f2539bec37..9604b3f5fb 100644
--- a/include/surf/surfxml_parse.h
+++ b/include/surf/surfxml_parse.h
@@ -9,6 +9,7 @@
 #define _SURF_SURFXML_PARSE_H
 
 #include "surf/surfxml.h"
+#include "xbt/sysdep.h" /* to have FILE */
 #include "xbt/misc.h"
 
 /* Entry-point of the surfxml parser. */
diff --git a/include/xbt/ex.h b/include/xbt/ex.h
index 3a4a7ba409..e8594e7e8f 100644
--- a/include/xbt/ex.h
+++ b/include/xbt/ex.h
@@ -32,8 +32,8 @@
 #ifndef __XBT_EX_H__
 #define __XBT_EX_H__
 
-#include <xbt/misc.h>
 #include <xbt/sysdep.h>
+#include <xbt/misc.h>
 
 /* do not include execinfo.h directly since it's not always available. 
    Instead, copy the parts we need (and fake when it's not there) */
diff --git a/include/xbt/swag.h b/include/xbt/swag.h
index be73804d75..863b8a52c7 100644
--- a/include/xbt/swag.h
+++ b/include/xbt/swag.h
@@ -13,8 +13,7 @@
 #define _XBT_SWAG_H
 
 #include "xbt/misc.h"
-#include "xbt/sysdep.h"
-
+#include "xbt/sysdep.h" /* sizeof */
 
 /** 
  * @addtogroup XBT_swag
diff --git a/src/xbt/graphxml_parse.c b/src/xbt/graphxml_parse.c
index e56b6dbfdc..a8463158d8 100644
--- a/src/xbt/graphxml_parse.c
+++ b/src/xbt/graphxml_parse.c
@@ -6,6 +6,7 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "xbt/misc.h"
+#include "xbt/sysdep.h"
 #include "xbt/log.h"
 #include "xbt/asserts.h"
 
-- 
2.20.1