From: Martin Quinson <martin.quinson@loria.fr>
Date: Mon, 14 Sep 2015 09:55:07 +0000 (+0200)
Subject: delay the inclusion of standard headers so that _CRT_*_NO_WARNINGS gets defined on... 
X-Git-Tag: v3_12~187^2~7
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/1c9907baf1d812e7b6e34382d2945568d6fac175

delay the inclusion of standard headers so that _CRT_*_NO_WARNINGS gets defined on time
---

diff --git a/include/xbt/automaton.h b/include/xbt/automaton.h
index a42027a1ec..6450412bf8 100644
--- a/include/xbt/automaton.h
+++ b/include/xbt/automaton.h
@@ -7,11 +7,11 @@
 #ifndef _XBT_AUTOMATON_H
 #define _XBT_AUTOMATON_H
 
-#include <stdlib.h>
-#include <string.h>
 #include <xbt/dynar.h>
 #include <xbt/sysdep.h>
 #include <xbt/graph.h>
+#include <stdlib.h>
+#include <string.h>
 
 SG_BEGIN_DECL()
 
diff --git a/include/xbt/config.h b/include/xbt/config.h
index e2d82d57f6..57fdd2f337 100644
--- a/include/xbt/config.h
+++ b/include/xbt/config.h
@@ -11,8 +11,8 @@
 #ifndef _XBT_CONFIG_H_
 #define _XBT_CONFIG_H_
 
-#include <stdarg.h>
 #include "xbt/dynar.h"
+#include <stdarg.h>
 
 SG_BEGIN_DECL()
 
diff --git a/src/xbt/config.c b/src/xbt/config.c
index 69389e7175..3f8a5e43b1 100644
--- a/src/xbt/config.c
+++ b/src/xbt/config.c
@@ -8,7 +8,6 @@
 /* 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. */
 
-#include <stdio.h>
 #include "xbt/misc.h"
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
@@ -17,6 +16,8 @@
 #include "xbt/dict.h"
 #include "xbt/peer.h"
 
+#include <stdio.h>
+
 #include "xbt/config.h"         /* prototypes of this module */
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_cfg, xbt, "configuration support");
diff --git a/src/xbt/graph.c b/src/xbt/graph.c
index 5d3629020e..a0d6538cc1 100644
--- a/src/xbt/graph.c
+++ b/src/xbt/graph.c
@@ -6,8 +6,6 @@
 /* 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. */
 
-#include <errno.h>
-#include <stdlib.h>
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
 #include "xbt/graph.h"
@@ -18,6 +16,8 @@
 #include "xbt/str.h"
 #include "xbt/file.h"
 
+#include <errno.h>
+#include <stdlib.h>
 
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_graph, xbt, "Graph");
diff --git a/src/xbt/xbt_replay.c b/src/xbt/xbt_replay.c
index 4b2872b50c..2802f52698 100644
--- a/src/xbt/xbt_replay.c
+++ b/src/xbt/xbt_replay.c
@@ -5,12 +5,13 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "internal_config.h"
-#include <errno.h>
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
 #include "xbt/str.h"
 #include "xbt/file.h"
 #include "xbt/replay.h"
+
+#include <errno.h>
 #include <ctype.h>
 #include <wchar.h>