Include standard header files after local includes.

It should fix the build on Debian Lenny (oldstable).

diff --git a/include/xbt/sysdep.h b/include/xbt/sysdep.h
index 4bc927c..536c12d 100644 (file)
--- a/include/xbt/sysdep.h
+++ b/include/xbt/sysdep.h
@@ -11,16 +11,16 @@
 #ifndef _XBT_SYSDEP_H
 #define _XBT_SYSDEP_H
 
-#include <string.h>
-#include <stdlib.h>
-#include <stdarg.h>             /* va_list */
-
 #include "xbt/log.h"
 #include "xbt/misc.h"
 #include "xbt/asserts.h"
 
 #include "simgrid_config.h"
 
+#include <string.h>
+#include <stdlib.h>
+#include <stdarg.h>             /* va_list */
+
 SG_BEGIN_DECL()
 
 /* They live in asserts.h, but need to be declared before this module.

diff --git a/src/include/surf/maxmin.h b/src/include/surf/maxmin.h
index ba06c74..9fd51c0 100644 (file)
--- a/src/include/surf/maxmin.h
+++ b/src/include/surf/maxmin.h
@@ -7,10 +7,10 @@
 #ifndef _SURF_MAXMIN_H
 #define _SURF_MAXMIN_H
 
-#include <math.h>
 #include "portable.h"
 #include "xbt/misc.h"
 #include "surf/datatypes.h"
+#include <math.h>
 
 extern double sg_maxmin_precision;
 #define MAXMIN_PRECISION sg_maxmin_precision

diff --git a/src/include/surf/random_mgr.h b/src/include/surf/random_mgr.h
index 3580ab4..ec942d3 100644 (file)
--- a/src/include/surf/random_mgr.h
+++ b/src/include/surf/random_mgr.h
@@ -9,8 +9,6 @@
 
 #include "xbt/heap.h"
 #include "xbt/dict.h"
-#include <stdlib.h>
-#include <math.h>
 
 SG_BEGIN_DECL()
 

diff --git a/src/instr/jedule/jedule_sd_binding.c b/src/instr/jedule/jedule_sd_binding.c
index dd3f433..a58226e 100644 (file)
--- a/src/instr/jedule/jedule_sd_binding.c
+++ b/src/instr/jedule/jedule_sd_binding.c
@@ -6,8 +6,6 @@
  */
 
 
-#include <stdio.h>
-
 #include "xbt/asserts.h"
 #include "xbt/dynar.h"
 
@@ -20,6 +18,8 @@
 #include "instr/jedule/jedule_platform.h"
 #include "instr/jedule/jedule_output.h"
 
+#include <stdio.h>
+
 #ifdef HAVE_JEDULE
 
 XBT_LOG_NEW_CATEGORY(jedule, "Logging specific to Jedule");

diff --git a/src/smpi/smpi_bench.c b/src/smpi/smpi_bench.c
index c3628c8..f3926a7 100644 (file)
--- a/src/smpi/smpi_bench.c
+++ b/src/smpi/smpi_bench.c
@@ -4,7 +4,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 <math.h> // sqrt
 #include "private.h"
 #include "xbt/dict.h"
 #include "xbt/sysdep.h"
@@ -16,6 +15,7 @@
 #include <sys/types.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <math.h> // sqrt
 #include <unistd.h>
 #include <string.h>
 #include <stdio.h>

diff --git a/src/surf/random_mgr.c b/src/surf/random_mgr.c
index 90326e6..d87ce7b 100644 (file)
--- a/src/surf/random_mgr.c
+++ b/src/surf/random_mgr.c
@@ -7,6 +7,8 @@
 #include "surf/random_mgr.h"
 #include "xbt/sysdep.h"
 #include "gras_config.h" /*_XBT_WIN32*/
+#include <math.h>
+#include <stdlib.h>
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(random, surf, "Random part of surf");
 

diff --git a/src/surf/surf.c b/src/surf/surf.c
index 19e441e..5fb7317 100644 (file)
--- a/src/surf/surf.c
+++ b/src/surf/surf.c
@@ -4,8 +4,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 <ctype.h>
-
 #include "surf_private.h"
 #include "xbt/module.h"
 #include "mc/mc.h"
@@ -13,6 +11,8 @@
 #include "surf/surf_resource.h"
 #include "xbt/xbt_os_thread.h"
 
+#include <ctype.h>
+
 XBT_LOG_NEW_CATEGORY(surf, "All SURF categories");
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_kernel, surf,
                                 "Logging specific to SURF (kernel)");

diff --git a/src/surf/surf_config.c b/src/surf/surf_config.c
index 4d286c2..8aa63e3 100644 (file)
--- a/src/surf/surf_config.c
+++ b/src/surf/surf_config.c
@@ -6,6 +6,7 @@
 
 /* surf_config: configuration infrastructure for the simulation world       */
 
+#include "xbt/misc.h"
 #include "xbt/config.h"
 #include "xbt/log.h"
 #include "xbt/str.h"

diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c
index 8561b86..4aadf20 100644 (file)
--- a/src/surf/surf_routing.c
+++ b/src/surf/surf_routing.c
@@ -4,14 +4,14 @@
 /* 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 <pcre.h>               /* regular expression library */
-
 #include "simgrid/platf_interface.h"    // platform creation API internal interface
 
 #include "surf_routing_private.h"
 #include "surf/surf_routing.h"
 #include "surf/surfxml_parse_values.h"
 
+#include <pcre.h>               /* regular expression library */
+
 /**
  * @ingroup SURF_build_api
  * @brief A library containing all known workstations

diff --git a/src/surf/surf_routing_generic.c b/src/surf/surf_routing_generic.c
index a3dd35c..6f6d587 100644 (file)
--- a/src/surf/surf_routing_generic.c
+++ b/src/surf/surf_routing_generic.c
@@ -4,14 +4,14 @@
 /* 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 <pcre.h>               /* regular expression library */
-
 #include "simgrid/platf_interface.h"    // platform creation API internal interface
 
 #include "surf_routing_private.h"
 #include "surf/surf_routing.h"
 #include "surf/surfxml_parse_values.h"
 
+#include <pcre.h>               /* regular expression library */
+
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_routing_generic, surf_route, "Generic implementation of the surf routing");
 
 static int no_bypassroute_declared = 1;

diff --git a/src/xbt/xbt_rl_time.c b/src/xbt/xbt_rl_time.c
index 1fbf9eb..5d36fd2 100644 (file)
--- a/src/xbt/xbt_rl_time.c
+++ b/src/xbt/xbt_rl_time.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 <math.h>               /* floor */
-
 #include "portable.h"
 
 #include "xbt/sysdep.h"
@@ -15,6 +13,8 @@
 #include "gras/virtu.h"
 #include "xbt/xbt_os_time.h"    /* private */
 
+#include <math.h>               /* floor */
+
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(gras_virtu);
 double xbt_time(void)
 {

diff --git a/testsuite/surf/maxmin_bench.c b/testsuite/surf/maxmin_bench.c
index 4d0f905..0d46aa5 100644 (file)
--- a/testsuite/surf/maxmin_bench.c
+++ b/testsuite/surf/maxmin_bench.c
@@ -11,13 +11,14 @@
 #endif
 
 
-#include <stdlib.h>
-#include <stdio.h>
 #include "surf/maxmin.h"
 #include "xbt/module.h"
 #include "xbt/xbt_os_time.h"
 #include "xbt/sysdep.h"         /* time manipulation for benchmarking */
 
+#include <stdlib.h>
+#include <stdio.h>
+
 double date;
 
 double float_random(double max);

diff --git a/testsuite/surf/trace_usage.c b/testsuite/surf/trace_usage.c
index 95514f5..5b1de6d 100644 (file)
--- a/testsuite/surf/trace_usage.c
+++ b/testsuite/surf/trace_usage.c
@@ -9,13 +9,15 @@
 #pragma hdrstop
 #endif
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
 #include "surf/trace_mgr.h"
 #include "surf/surf.h"
 
 #include "xbt/log.h"
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
 XBT_LOG_NEW_DEFAULT_CATEGORY(surf_test,
                              "Messages specific for surf example");