public headers should include simgrid in a system-wide way, not a project-wide one

I'm not sure why stdio.h is not included by our public headers
anymore, but that's actually a feature, not a bug. The user knows
whether she wants to include stdio herself.

diff --git a/doc/tuto-msg/masterworker-sol1.c b/doc/tuto-msg/masterworker-sol1.c
index c0ceffc..7441cab 100644 (file)
--- a/doc/tuto-msg/masterworker-sol1.c
+++ b/doc/tuto-msg/masterworker-sol1.c
@@ -1,10 +1,12 @@
-/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2018. 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. */
 
 #include "simgrid/msg.h"
 
 
 /* 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 "simgrid/msg.h"
 

+#include <stdio.h> /* sprintf */
+

 XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test, "Messages specific for this msg example");
 
 #define FINALIZE ((void*)221297) /* a magic number to tell people to stop working */
 XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test, "Messages specific for this msg example");
 
 #define FINALIZE ((void*)221297) /* a magic number to tell people to stop working */

diff --git a/doc/tuto-msg/masterworker-sol2.c b/doc/tuto-msg/masterworker-sol2.c
index 317335f..2b71a0b 100644 (file)
--- a/doc/tuto-msg/masterworker-sol2.c
+++ b/doc/tuto-msg/masterworker-sol2.c
@@ -1,10 +1,12 @@
-/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2018. 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. */
 
 #include "simgrid/msg.h"
 
 
 /* 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 "simgrid/msg.h"
 

+#include <stdio.h> /* sprintf */
+

 XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test, "Messages specific for this msg example");
 
 #define FINALIZE ((void*)221297) /* a magic number to tell people to stop working */
 XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test, "Messages specific for this msg example");
 
 #define FINALIZE ((void*)221297) /* a magic number to tell people to stop working */

diff --git a/doc/tuto-msg/masterworker-sol3.c b/doc/tuto-msg/masterworker-sol3.c
index 29d10fa..8cb7f19 100644 (file)
--- a/doc/tuto-msg/masterworker-sol3.c
+++ b/doc/tuto-msg/masterworker-sol3.c
@@ -1,10 +1,12 @@
-/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2018. 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. */
 
 #include "simgrid/msg.h"
 
 
 /* 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 "simgrid/msg.h"
 

+#include <stdio.h> /* sprintf */
+

 XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test, "Messages specific for this msg example");
 
 #define FINALIZE ((void*)221297) /* a magic number to tell people to stop working */
 XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test, "Messages specific for this msg example");
 
 #define FINALIZE ((void*)221297) /* a magic number to tell people to stop working */

diff --git a/doc/tuto-msg/masterworker-sol4.c b/doc/tuto-msg/masterworker-sol4.c
index 4aaade0..890cdc4 100644 (file)
--- a/doc/tuto-msg/masterworker-sol4.c
+++ b/doc/tuto-msg/masterworker-sol4.c
@@ -1,10 +1,12 @@
-/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2018. 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. */
 
 #include "simgrid/msg.h"
 
 
 /* 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 "simgrid/msg.h"
 

+#include <stdio.h> /* sprintf */
+

 XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test, "Messages specific for this msg example");
 
 #define FINALIZE ((void*)221297) /* a magic number to tell people to stop working */
 XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test, "Messages specific for this msg example");
 
 #define FINALIZE ((void*)221297) /* a magic number to tell people to stop working */

diff --git a/doc/tuto-msg/masterworker.c b/doc/tuto-msg/masterworker.c
index 64cccb6..4ff16b0 100644 (file)
--- a/doc/tuto-msg/masterworker.c
+++ b/doc/tuto-msg/masterworker.c
@@ -1,10 +1,12 @@
-/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2018. 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. */
 
 #include "simgrid/msg.h"
 
 
 /* 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 "simgrid/msg.h"
 

+#include <stdio.h> /* sprintf */
+

 XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test, "Messages specific for this msg example");
 
 #define FINALIZE ((void*)221297) /* a magic number to tell people to stop working */
 XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test, "Messages specific for this msg example");
 
 #define FINALIZE ((void*)221297) /* a magic number to tell people to stop working */

diff --git a/examples/msg/app-masterworker/app-masterworker.c b/examples/msg/app-masterworker/app-masterworker.c
index ff45776..55aaf69 100644 (file)
--- a/examples/msg/app-masterworker/app-masterworker.c
+++ b/examples/msg/app-masterworker/app-masterworker.c
@@ -1,10 +1,12 @@
-/* Copyright (c) 2010-2016. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2010-2018. 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. */
 
 #include "simgrid/msg.h"
 
 
 /* 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 "simgrid/msg.h"
 

+#include <stdio.h> /* snprintf */
+

 XBT_LOG_NEW_DEFAULT_CATEGORY(msg_app_masterworker, "Messages specific for this msg example");
 
 /* Main function of the master process */
 XBT_LOG_NEW_DEFAULT_CATEGORY(msg_app_masterworker, "Messages specific for this msg example");
 
 /* Main function of the master process */

diff --git a/examples/msg/cloud-masterworker/cloud-masterworker.c b/examples/msg/cloud-masterworker/cloud-masterworker.c
index 07c7556..93b2ef3 100644 (file)
--- a/examples/msg/cloud-masterworker/cloud-masterworker.c
+++ b/examples/msg/cloud-masterworker/cloud-masterworker.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2018. 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. */


@@ -6,6 +6,8 @@
 #include "simgrid/msg.h"
 #include "simgrid/plugins/live_migration.h"
 
 #include "simgrid/msg.h"
 #include "simgrid/plugins/live_migration.h"
 

+#include <stdio.h> /* snprintf */
+

 XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test, "Messages specific for this msg example");
 
 #define MAXMBOXLEN 64
 XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test, "Messages specific for this msg example");
 
 #define MAXMBOXLEN 64

diff --git a/examples/msg/dht-kademlia/dht-kademlia.c b/examples/msg/dht-kademlia/dht-kademlia.c
index d40ca6c..f932373 100644 (file)
--- a/examples/msg/dht-kademlia/dht-kademlia.c
+++ b/examples/msg/dht-kademlia/dht-kademlia.c
@@ -1,5 +1,4 @@
-/* Copyright (c) 2012, 2014-2017. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2012-2018. 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. */


@@ -9,6 +8,9 @@
 #include "task.h"
 
 #include "simgrid/msg.h"
 #include "task.h"
 
 #include "simgrid/msg.h"

+
+#include <stdio.h> /* snprintf */
+

 /** @addtogroup MSG_examples
   * <b>kademlia/kademlia.c: Kademlia protocol</b>
   * Implements the Kademlia protocol, using 32 bits identifiers.
 /** @addtogroup MSG_examples
   * <b>kademlia/kademlia.c: Kademlia protocol</b>
   * Implements the Kademlia protocol, using 32 bits identifiers.

diff --git a/examples/msg/dht-kademlia/node.c b/examples/msg/dht-kademlia/node.c
index 2d8c22f..20b9fbe 100644 (file)
--- a/examples/msg/dht-kademlia/node.c
+++ b/examples/msg/dht-kademlia/node.c
@@ -1,5 +1,4 @@
-/* Copyright (c) 2010, 2012-2017. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2010-2018. 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. */


@@ -8,6 +7,8 @@
 #include "routing_table.h"
 #include "simgrid/msg.h"
 
 #include "routing_table.h"
 #include "simgrid/msg.h"
 

+#include <stdio.h> /* snprintf */
+

 XBT_LOG_NEW_DEFAULT_CATEGORY(msg_kademlia_node, "Messages specific for this msg example");
 
 /** @brief Initialization of a node
 XBT_LOG_NEW_DEFAULT_CATEGORY(msg_kademlia_node, "Messages specific for this msg example");
 
 /** @brief Initialization of a node

diff --git a/examples/msg/dht-pastry/dht-pastry.c b/examples/msg/dht-pastry/dht-pastry.c
index c19cd35..191ae07 100644 (file)
--- a/examples/msg/dht-pastry/dht-pastry.c
+++ b/examples/msg/dht-pastry/dht-pastry.c
@@ -6,8 +6,9 @@
 
 #include "simgrid/msg.h"
 #include "xbt/dynar.h"
 
 #include "simgrid/msg.h"
 #include "xbt/dynar.h"

-#include <math.h>

 
 

+#include <math.h>
+#include <stdio.h>

 
 XBT_LOG_NEW_DEFAULT_CATEGORY(msg_pastry, "Messages specific for this msg example");
 
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(msg_pastry, "Messages specific for this msg example");
 

diff --git a/examples/msg/network-ns3/network-ns3.c b/examples/msg/network-ns3/network-ns3.c
index 390ca97..f133b16 100644 (file)
--- a/examples/msg/network-ns3/network-ns3.c
+++ b/examples/msg/network-ns3/network-ns3.c
@@ -1,10 +1,12 @@
-/* Copyright (c) 2007-2016. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2018. 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. */
 
 #include "simgrid/msg.h"
 
 
 /* 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 "simgrid/msg.h"
 

+#include <stdio.h> /* snprintf */
+

 XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test, "Messages specific for this msg example");
 
 int timer_start; //set as 1 in the master process
 XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test, "Messages specific for this msg example");
 
 int timer_start; //set as 1 in the master process

diff --git a/examples/msg/platform-failures/platform-failures.c b/examples/msg/platform-failures/platform-failures.c
index 6875eb0..7771e50 100644 (file)
--- a/examples/msg/platform-failures/platform-failures.c
+++ b/examples/msg/platform-failures/platform-failures.c
@@ -1,11 +1,12 @@
-/* Copyright (c) 2007-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2007-2018. 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. */
 
 #include "simgrid/msg.h"
 
 
 /* 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 "simgrid/msg.h"
 

+#include <stdio.h> /* snprintf */
+

 XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test, "Messages specific for this msg example");
 
 #define FINALIZE ((void*)221297)        /* a magic number to tell people to stop working */
 XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test, "Messages specific for this msg example");
 
 #define FINALIZE ((void*)221297)        /* a magic number to tell people to stop working */

diff --git a/examples/smpi/smpi_msg_masterslave/masterslave_mailbox_smpi.c b/examples/smpi/smpi_msg_masterslave/masterslave_mailbox_smpi.c
index 2ea6b1b..b3ccbfb 100644 (file)
--- a/examples/smpi/smpi_msg_masterslave/masterslave_mailbox_smpi.c
+++ b/examples/smpi/smpi_msg_masterslave/masterslave_mailbox_smpi.c
@@ -1,10 +1,13 @@
-/* Copyright (c) 2010-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2010-2018. 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. */
 
 #include "simgrid/msg.h"
 #include "mpi.h"
 
 /* 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 "simgrid/msg.h"
 #include "mpi.h"

+
+#include <stdio.h> /* snprintf */
+

 XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test, "Messages specific for this msg example");
 
 static int master(int argc, char *argv[])
 XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test, "Messages specific for this msg example");
 
 static int master(int argc, char *argv[])

diff --git a/include/simgrid/forward.h b/include/simgrid/forward.h
index 170910d..ecf224b 100644 (file)
--- a/include/simgrid/forward.h
+++ b/include/simgrid/forward.h
@@ -8,8 +8,9 @@
 
 #ifdef __cplusplus
 
 
 #ifdef __cplusplus
 

-#include "s4u/forward.hpp"
-#include "xbt/base.h"
+#include <simgrid/s4u/forward.hpp>
+#include <xbt/base.h>
+

 #include <boost/intrusive_ptr.hpp>
 
 namespace simgrid {
 #include <boost/intrusive_ptr.hpp>
 
 namespace simgrid {

diff --git a/include/simgrid/host.h b/include/simgrid/host.h
index 109540c..2350923 100644 (file)
--- a/include/simgrid/host.h
+++ b/include/simgrid/host.h
@@ -1,5 +1,4 @@
-/* Copyright (c) 2013-2018. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2013-2018. 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. */

diff --git a/include/simgrid/instr.h b/include/simgrid/instr.h
index d36c6ce..dcf444e 100644 (file)
--- a/include/simgrid/instr.h
+++ b/include/simgrid/instr.h
@@ -1,5 +1,4 @@
-/* Copyright (c) 2010-2018. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2010-2018. 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. */


@@ -7,8 +6,8 @@
 #ifndef INSTR_H_
 #define INSTR_H_
 
 #ifndef INSTR_H_
 #define INSTR_H_
 

-#include "xbt.h"
-#include "simgrid/msg.h"
+#include <simgrid/msg.h>
+#include <xbt.h>

 
 SG_BEGIN_DECL()
 
 
 SG_BEGIN_DECL()
 

diff --git a/include/simgrid/jedule/jedule.hpp b/include/simgrid/jedule/jedule.hpp
index 6a19881..dcc32d4 100644 (file)
--- a/include/simgrid/jedule/jedule.hpp
+++ b/include/simgrid/jedule/jedule.hpp
@@ -1,16 +1,16 @@
-/* Copyright (c) 2010-2012, 2014-2018. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2010-2018. 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. */
 
 #ifndef JEDULE_HPP_
 #define JEDULE_HPP_
 
 /* 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. */
 
 #ifndef JEDULE_HPP_
 #define JEDULE_HPP_

-#include "simgrid_config.h"
-#include <cstdio>

 
 

-#include "jedule_events.hpp"
-#include "jedule_platform.hpp"
+#include <simgrid/jedule/jedule_events.hpp>
+#include <simgrid/jedule/jedule_platform.hpp>
+#include <simgrid_config.h>
+
+#include <cstdio>

 
 #if SIMGRID_HAVE_JEDULE
 
 
 #if SIMGRID_HAVE_JEDULE
 

diff --git a/include/simgrid/jedule/jedule_events.hpp b/include/simgrid/jedule/jedule_events.hpp
index 6f57c01..4362ffe 100644 (file)
--- a/include/simgrid/jedule/jedule_events.hpp
+++ b/include/simgrid/jedule/jedule_events.hpp
@@ -1,5 +1,4 @@
-/* Copyright (c) 2010-2012, 2014-2018. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2010-2018. 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. */


@@ -7,14 +6,15 @@
 #ifndef JEDULE_EVENTS_H_
 #define JEDULE_EVENTS_H_
 
 #ifndef JEDULE_EVENTS_H_
 #define JEDULE_EVENTS_H_
 

-#include "simgrid_config.h"
-#include "simgrid/forward.h"
+#include <simgrid/jedule/jedule_platform.hpp>
+
+#include <simgrid/forward.h>
+#include <simgrid_config.h>
+

 #include <vector>
 #include <string>
 #include <unordered_map>
 
 #include <vector>
 #include <string>
 #include <unordered_map>
 

-#include "jedule_platform.hpp"
-

 #if SIMGRID_HAVE_JEDULE
 namespace simgrid {
 namespace jedule{
 #if SIMGRID_HAVE_JEDULE
 namespace simgrid {
 namespace jedule{

diff --git a/include/simgrid/jedule/jedule_platform.hpp b/include/simgrid/jedule/jedule_platform.hpp
index d7a7b4c..1b0c32c 100644 (file)
--- a/include/simgrid/jedule/jedule_platform.hpp
+++ b/include/simgrid/jedule/jedule_platform.hpp
@@ -1,5 +1,4 @@
-/* Copyright (c) 2010-2012, 2014-2018. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2010-2018. 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. */


@@ -7,12 +6,14 @@
 #ifndef JED_SIMGRID_PLATFORM_H_
 #define JED_SIMGRID_PLATFORM_H_
 
 #ifndef JED_SIMGRID_PLATFORM_H_
 #define JED_SIMGRID_PLATFORM_H_
 

-#include "simgrid_config.h"
-#include "simgrid/forward.h"
-#include "xbt/dynar.h"
+#include <simgrid/forward.h>
+#include <simgrid_config.h>
+#include <xbt/dynar.h>
+

 #include <unordered_map>
 #include <vector>
 #include <string>
 #include <unordered_map>
 #include <vector>
 #include <string>

+

 #if SIMGRID_HAVE_JEDULE
 
 namespace simgrid {
 #if SIMGRID_HAVE_JEDULE
 
 namespace simgrid {

diff --git a/include/simgrid/jedule/jedule_sd_binding.h b/include/simgrid/jedule/jedule_sd_binding.h
index 969cdfd..5f5ab68 100644 (file)
--- a/include/simgrid/jedule/jedule_sd_binding.h
+++ b/include/simgrid/jedule/jedule_sd_binding.h
@@ -1,5 +1,4 @@
-/* Copyright (c) 2010-2011, 2013-2018. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2010-2018. 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. */


@@ -7,8 +6,8 @@
 #ifndef JEDULE_SD_BINDING_H_
 #define JEDULE_SD_BINDING_H_
 
 #ifndef JEDULE_SD_BINDING_H_
 #define JEDULE_SD_BINDING_H_
 

-#include "simgrid_config.h"
-#include "simgrid/simdag.h"
+#include <simgrid/simdag.h>
+#include <simgrid_config.h>

 
 #if SIMGRID_HAVE_JEDULE
 SG_BEGIN_DECL()
 
 #if SIMGRID_HAVE_JEDULE
 SG_BEGIN_DECL()


@@ -17,6 +16,6 @@ XBT_PUBLIC void jedule_sd_init(void);
 XBT_PUBLIC void jedule_sd_exit(void);
 XBT_PUBLIC void jedule_sd_dump(const char* filename);
 SG_END_DECL()
 XBT_PUBLIC void jedule_sd_exit(void);
 XBT_PUBLIC void jedule_sd_dump(const char* filename);
 SG_END_DECL()

-#endif /* JEDULE_SD_BINDING_H_ */
-

 #endif
 #endif

+
+#endif /* JEDULE_SD_BINDING_H_ */

diff --git a/include/simgrid/link.h b/include/simgrid/link.h
index e3c465d..07aecc9 100644 (file)
--- a/include/simgrid/link.h
+++ b/include/simgrid/link.h
@@ -1,7 +1,6 @@
 /* Public interface to the Link datatype                                    */
 
 /* Public interface to the Link datatype                                    */
 

-/* Copyright (c) 2015-2018. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2015-2018. 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. */


@@ -9,8 +8,8 @@
 #ifndef INCLUDE_SIMGRID_LINK_H_
 #define INCLUDE_SIMGRID_LINK_H_
 
 #ifndef INCLUDE_SIMGRID_LINK_H_
 #define INCLUDE_SIMGRID_LINK_H_
 

-#include "simgrid/forward.h"
-#include "xbt/base.h"
+#include <simgrid/forward.h>
+#include <xbt/base.h>

 
 /* C interface */
 SG_BEGIN_DECL()
 
 /* C interface */
 SG_BEGIN_DECL()

diff --git a/include/simgrid/msg.h b/include/simgrid/msg.h
index 387efa6..7609aa4 100644 (file)
--- a/include/simgrid/msg.h
+++ b/include/simgrid/msg.h
@@ -3,20 +3,20 @@
 /* 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. */
 

-#ifndef MSG_H
-#define MSG_H
+#ifndef SIMGRID_MSG_H
+#define SIMGRID_MSG_H

 
 

-#include "simgrid/forward.h"
-#include "simgrid/host.h"
-#include "simgrid/plugins/live_migration.h"
-
-#include "xbt/base.h"
-#include "xbt/dict.h"
-#include "xbt/dynar.h"
+#include <simgrid/forward.h>
+#include <simgrid/host.h>
+#include <simgrid/instr.h>
+#include <simgrid/plugins/live_migration.h>
+#include <xbt/base.h>
+#include <xbt/dict.h>
+#include <xbt/dynar.h>

 
 #ifdef __cplusplus
 
 #ifdef __cplusplus

-#include "simgrid/simix.h"

 #include <map>
 #include <map>

+#include <simgrid/simix.h>

 namespace simgrid {
 namespace msg {
 class Comm;
 namespace simgrid {
 namespace msg {
 class Comm;


@@ -413,8 +413,6 @@ XBT_PUBLIC sg_host_t sg_vm_get_pm(sg_vm_t vm);
 XBT_PUBLIC void sg_vm_set_bound(sg_vm_t vm, double bound);
 #define MSG_vm_set_bound(vm, bound) sg_vm_set_bound(vm, bound)
 
 XBT_PUBLIC void sg_vm_set_bound(sg_vm_t vm, double bound);
 #define MSG_vm_set_bound(vm, bound) sg_vm_set_bound(vm, bound)
 

-#include "simgrid/instr.h"
-

 /* ****************************************************************************************** */
 /* Used only by the bindings -- unclean pimple, please ignore if you're not writing a binding */
 XBT_PUBLIC smx_context_t MSG_process_get_smx_ctx(msg_process_t process);
 /* ****************************************************************************************** */
 /* Used only by the bindings -- unclean pimple, please ignore if you're not writing a binding */
 XBT_PUBLIC smx_context_t MSG_process_get_smx_ctx(msg_process_t process);

diff --git a/include/simgrid/s4u/Actor.hpp b/include/simgrid/s4u/Actor.hpp
index 598721c..661e52d 100644 (file)
--- a/include/simgrid/s4u/Actor.hpp
+++ b/include/simgrid/s4u/Actor.hpp
@@ -51,7 +51,7 @@ namespace s4u {
  * pure function or as an object. It is very simple with functions:
  *
  * @code{.cpp}
  * pure function or as an object. It is very simple with functions:
  *
  * @code{.cpp}

- * #include "s4u/actor.hpp"
+ * #include <simgrid/s4u/actor.hpp>

  *
  * // Declare the code of your worker
  * void worker() {
  *
  * // Declare the code of your worker
  * void worker() {


@@ -69,7 +69,7 @@ namespace s4u {
  * The syntax is slightly more complicated, but not much.
  *
  * @code{.cpp}
  * The syntax is slightly more complicated, but not much.
  *
  * @code{.cpp}

- * #include "s4u/actor.hpp"
+ * #include <simgrid/s4u/actor.hpp>

  *
  * // Declare the class representing your actors
  * class Worker {
  *
  * // Declare the class representing your actors
  * class Worker {

diff --git a/include/simgrid/s4u/Host.hpp b/include/simgrid/s4u/Host.hpp
index 092908e..c5d4e09 100644 (file)
--- a/include/simgrid/s4u/Host.hpp
+++ b/include/simgrid/s4u/Host.hpp
@@ -6,17 +6,16 @@
 #ifndef SIMGRID_S4U_HOST_HPP
 #define SIMGRID_S4U_HOST_HPP
 
 #ifndef SIMGRID_S4U_HOST_HPP
 #define SIMGRID_S4U_HOST_HPP
 

+#include <simgrid/forward.h>
+#include <simgrid/s4u/forward.hpp>
+#include <xbt/Extendable.hpp>
+#include <xbt/signal.hpp>
+#include <xbt/string.hpp>
+

 #include <map>
 #include <string>
 #include <unordered_map>
 
 #include <map>
 #include <string>
 #include <unordered_map>
 

-#include "xbt/Extendable.hpp"
-#include "xbt/signal.hpp"
-#include "xbt/string.hpp"
-
-#include "simgrid/forward.h"
-#include "simgrid/s4u/forward.hpp"
-

 namespace simgrid {
 
 namespace xbt {
 namespace simgrid {
 
 namespace xbt {

diff --git a/include/simgrid/s4u/Mutex.hpp b/include/simgrid/s4u/Mutex.hpp
index 6d58988..ce19858 100644 (file)
--- a/include/simgrid/s4u/Mutex.hpp
+++ b/include/simgrid/s4u/Mutex.hpp
@@ -11,8 +11,8 @@
 
 #include <boost/intrusive_ptr.hpp>
 
 
 #include <boost/intrusive_ptr.hpp>
 

+#include <simgrid/simix.h>

 #include <xbt/base.h>
 #include <xbt/base.h>

-#include "simgrid/simix.h"

 
 namespace simgrid {
 namespace s4u {
 
 namespace simgrid {
 namespace s4u {

diff --git a/include/simgrid/s4u/Storage.hpp b/include/simgrid/s4u/Storage.hpp
index 5366365..dc93710 100644 (file)
--- a/include/simgrid/s4u/Storage.hpp
+++ b/include/simgrid/s4u/Storage.hpp
@@ -1,5 +1,4 @@
-/* Copyright (c) 2006-2015, 2017-2018. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2006-2018. 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. */


@@ -7,13 +6,14 @@
 #ifndef INCLUDE_SIMGRID_S4U_STORAGE_HPP_
 #define INCLUDE_SIMGRID_S4U_STORAGE_HPP_
 
 #ifndef INCLUDE_SIMGRID_S4U_STORAGE_HPP_
 #define INCLUDE_SIMGRID_S4U_STORAGE_HPP_
 

-#include "xbt/Extendable.hpp"
-#include <map>

 #include <simgrid/s4u/forward.hpp>
 #include <simgrid/simix.h>
 #include <simgrid/s4u/forward.hpp>
 #include <simgrid/simix.h>

+#include <xbt/Extendable.hpp>
+#include <xbt/base.h>
+
+#include <map>

 #include <string>
 #include <unordered_map>
 #include <string>
 #include <unordered_map>

-#include <xbt/base.h>

 
 namespace simgrid {
 namespace xbt {
 
 namespace simgrid {
 namespace xbt {

diff --git a/include/simgrid/s4u/VirtualMachine.hpp b/include/simgrid/s4u/VirtualMachine.hpp
index ea9aff0..89063d5 100644 (file)
--- a/include/simgrid/s4u/VirtualMachine.hpp
+++ b/include/simgrid/s4u/VirtualMachine.hpp
@@ -6,8 +6,8 @@
 #ifndef SIMGRID_S4U_VM_HPP
 #define SIMGRID_S4U_VM_HPP
 
 #ifndef SIMGRID_S4U_VM_HPP
 #define SIMGRID_S4U_VM_HPP
 

-#include "simgrid/s4u/Host.hpp"
-#include "simgrid/s4u/forward.hpp"
+#include <simgrid/s4u/Host.hpp>
+#include <simgrid/s4u/forward.hpp>

 
 enum e_surf_vm_state_t {
   SURF_VM_STATE_CREATED, /**< created, but not yet started */
 
 enum e_surf_vm_state_t {
   SURF_VM_STATE_CREATED, /**< created, but not yet started */

diff --git a/include/simgrid/simdag.h b/include/simgrid/simdag.h
index 9194eab..cb54bd9 100644 (file)
--- a/include/simgrid/simdag.h
+++ b/include/simgrid/simdag.h
@@ -1,19 +1,20 @@
-/* Copyright (c) 2006-2010, 2012-2018. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2006-2018. 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. */
 

-#ifndef SIMDAG_SIMDAG_H
-#define SIMDAG_SIMDAG_H
+#ifndef SIMGRID_SIMDAG_H
+#define SIMGRID_SIMDAG_H
+
+#include <simgrid/host.h>
+#include <simgrid/link.h>
+#include <xbt/log.h>
+#include <xbt/sysdep.h>

 
 

-#include "simgrid/host.h"
-#include "simgrid/link.h"
-#include "xbt/log.h"
-#include "xbt/sysdep.h"

 #ifdef __cplusplus
 #include <set>
 #endif
 #ifdef __cplusplus
 #include <set>
 #endif

+

 SG_BEGIN_DECL()
 
 /** @brief Link opaque datatype
 SG_BEGIN_DECL()
 
 /** @brief Link opaque datatype

diff --git a/include/simgrid/simix.h b/include/simgrid/simix.h
index 5c2e970..6bd4bf6 100644 (file)
--- a/include/simgrid/simix.h
+++ b/include/simgrid/simix.h
@@ -3,13 +3,13 @@
 /* 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. */
 

-#ifndef _SIMIX_SIMIX_H
-#define _SIMIX_SIMIX_H
+#ifndef SIMGRID_SIMIX_H
+#define SIMGRID_SIMIX_H

 
 

-#include "simgrid/forward.h"
-#include "simgrid/host.h"
-#include "xbt/ex.h"
-#include "xbt/parmap.h"
+#include <simgrid/forward.h>
+#include <simgrid/host.h>
+#include <xbt/ex.h>
+#include <xbt/parmap.h>

 #ifdef __cplusplus
 #include <map>
 #endif
 #ifdef __cplusplus
 #include <map>
 #endif


@@ -280,4 +280,4 @@ XBT_PUBLIC int simcall_mc_random(int min, int max);
 
 SG_END_DECL()
 
 
 SG_END_DECL()
 

-#endif                          /* _SIMIX_SIMIX_H */
+#endif

diff --git a/include/xbt/RngStream.h b/include/xbt/RngStream.h
index ffed6ac..ad3336d 100644 (file)
--- a/include/xbt/RngStream.h
+++ b/include/xbt/RngStream.h
@@ -1,5 +1,4 @@
-/* Copyright (c) 2012, 2014-2018. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2012-2018. 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. */


@@ -8,7 +7,7 @@
 #ifndef RNGSTREAM_H
 #define RNGSTREAM_H
 
 #ifndef RNGSTREAM_H
 #define RNGSTREAM_H
 

-#include "misc.h"
+#include <xbt/misc.h>

 
 typedef struct RngStream_InfoState * RngStream;
 
 
 typedef struct RngStream_InfoState * RngStream;
 

diff --git a/include/xbt/asserts.h b/include/xbt/asserts.h
index da09fba..5e78a3b 100644 (file)
--- a/include/xbt/asserts.h
+++ b/include/xbt/asserts.h
@@ -1,7 +1,6 @@
 /*  xbt/asserts.h -- assertion mechanism                                    */
 
 /*  xbt/asserts.h -- assertion mechanism                                    */
 

-/* Copyright (c) 2005-2007, 2009-2014. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2005-2018. 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. */


@@ -9,9 +8,9 @@
 #ifndef XBT_ASSERTS_H
 #define XBT_ASSERTS_H
 
 #ifndef XBT_ASSERTS_H
 #define XBT_ASSERTS_H
 

-#include "xbt/misc.h"
-#include "xbt/log.h"
-#include "xbt/ex.h"
+#include <xbt/ex.h>
+#include <xbt/log.h>
+#include <xbt/misc.h>

 
 SG_BEGIN_DECL()
 XBT_PUBLIC_DATA int xbt_log_no_loc; /* Do not show the backtrace on failed backtrace when doing our tests */
 
 SG_BEGIN_DECL()
 XBT_PUBLIC_DATA int xbt_log_no_loc; /* Do not show the backtrace on failed backtrace when doing our tests */

diff --git a/include/xbt/cunit.h b/include/xbt/cunit.h
index 0edb99d..296b582 100644 (file)
--- a/include/xbt/cunit.h
+++ b/include/xbt/cunit.h
@@ -10,8 +10,8 @@
 #ifndef XBT_CUNIT_H_
 #define XBT_CUNIT_H_
 
 #ifndef XBT_CUNIT_H_
 #define XBT_CUNIT_H_
 

-#include "xbt/sysdep.h"         /* XBT_GNU_PRINTF */
-#include "xbt/ex.h"
+#include <xbt/ex.h>
+#include <xbt/sysdep.h> /* XBT_GNU_PRINTF */

 
 SG_BEGIN_DECL()
 
 
 SG_BEGIN_DECL()
 

diff --git a/include/xbt/dict.h b/include/xbt/dict.h
index 3c27e58..a4623bf 100644 (file)
--- a/include/xbt/dict.h
+++ b/include/xbt/dict.h
@@ -8,8 +8,9 @@
 #ifndef XBT_DICT_H
 #define XBT_DICT_H
 
 #ifndef XBT_DICT_H
 #define XBT_DICT_H
 

-#include "xbt/misc.h"           /* SG_BEGIN_DECL */
-#include "xbt/dynar.h"          /* void_f_pvoid_t */
+#include <xbt/dynar.h> /* void_f_pvoid_t */
+#include <xbt/misc.h>  /* SG_BEGIN_DECL */
+

 #include <stdint.h>             /* uintptr_t */
 
 SG_BEGIN_DECL()
 #include <stdint.h>             /* uintptr_t */
 
 SG_BEGIN_DECL()

diff --git a/include/xbt/ex.h b/include/xbt/ex.h
index 5a4e63e..dc6596c 100644 (file)
--- a/include/xbt/ex.h
+++ b/include/xbt/ex.h
@@ -1,5 +1,4 @@
-/* Copyright (c) 2005-2018. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2005-2018. 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. */


@@ -9,10 +8,10 @@
 
 #include <stdlib.h>
 
 
 #include <stdlib.h>
 

-#include "xbt/base.h"
-#include "xbt/sysdep.h"
-#include "xbt/misc.h"
-#include "xbt/virtu.h"
+#include <xbt/base.h>
+#include <xbt/misc.h>
+#include <xbt/sysdep.h>
+#include <xbt/virtu.h>

 
 /** @addtogroup XBT_ex_c
  *  @brief Exceptions support (C)
 
 /** @addtogroup XBT_ex_c
  *  @brief Exceptions support (C)

diff --git a/include/xbt/function_types.h b/include/xbt/function_types.h
index f9883a5..a08d990 100644 (file)
--- a/include/xbt/function_types.h
+++ b/include/xbt/function_types.h
@@ -1,6 +1,6 @@
 /* function_type.h - classical types for pointer to function                */
 
 /* function_type.h - classical types for pointer to function                */
 

-/* Copyright (c) 2006-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2006-2018. 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. */


@@ -8,7 +8,7 @@
 #ifndef XBT_FUNCTION_TYPE_H
 #define XBT_FUNCTION_TYPE_H
 
 #ifndef XBT_FUNCTION_TYPE_H
 #define XBT_FUNCTION_TYPE_H
 

-#include "xbt/base.h"
+#include <xbt/base.h>

 
 SG_BEGIN_DECL()
 
 
 SG_BEGIN_DECL()
 

diff --git a/include/xbt/functional.hpp b/include/xbt/functional.hpp
index 8b73dab..1c6983a 100644 (file)
--- a/include/xbt/functional.hpp
+++ b/include/xbt/functional.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2015-2018. 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. */


@@ -6,6 +6,9 @@
 #ifndef XBT_FUNCTIONAL_HPP
 #define XBT_FUNCTIONAL_HPP
 
 #ifndef XBT_FUNCTIONAL_HPP
 #define XBT_FUNCTIONAL_HPP
 

+#include <xbt/sysdep.h>
+#include <xbt/utility.hpp>
+

 #include <cstddef>
 #include <cstdlib>
 #include <cstring>
 #include <cstddef>
 #include <cstdlib>
 #include <cstring>


@@ -20,9 +23,6 @@
 #include <utility>
 #include <vector>
 
 #include <utility>
 #include <vector>
 

-#include "xbt/sysdep.h"
-#include "xbt/utility.hpp"
-

 namespace simgrid {
 namespace xbt {
 
 namespace simgrid {
 namespace xbt {
 

diff --git a/include/xbt/graph.h b/include/xbt/graph.h
index 5346279..e4cd6ef 100644 (file)
--- a/include/xbt/graph.h
+++ b/include/xbt/graph.h
@@ -5,8 +5,10 @@
 
 #ifndef XBT_GRAPH_H
 #define XBT_GRAPH_H
 
 #ifndef XBT_GRAPH_H
 #define XBT_GRAPH_H

-#include "xbt/misc.h"           /* SG_BEGIN_DECL */
-#include "xbt/dynar.h"
+
+#include <xbt/dynar.h>
+#include <xbt/misc.h> /* SG_BEGIN_DECL */
+

 SG_BEGIN_DECL()
 
   /** @addtogroup XBT_graph
 SG_BEGIN_DECL()
 
   /** @addtogroup XBT_graph

diff --git a/include/xbt/log.h b/include/xbt/log.h
index ebaa88f..34bc142 100644 (file)
--- a/include/xbt/log.h
+++ b/include/xbt/log.h
@@ -28,9 +28,9 @@
 #ifndef XBT_LOG_H
 #define XBT_LOG_H
 
 #ifndef XBT_LOG_H
 #define XBT_LOG_H
 

-#include "xbt/misc.h"

 #include <stdarg.h>
 #include <stdarg.h>

-#include <stddef.h>             /* NULL */
+#include <stddef.h> /* NULL */
+#include <xbt/misc.h>

 SG_BEGIN_DECL()
 /**\brief Log priorities
  * \ingroup XBT_log
 SG_BEGIN_DECL()
 /**\brief Log priorities
  * \ingroup XBT_log

diff --git a/include/xbt/mallocator.h b/include/xbt/mallocator.h
index d6107d4..7b76ed8 100644 (file)
--- a/include/xbt/mallocator.h
+++ b/include/xbt/mallocator.h
@@ -1,7 +1,6 @@
 /* xbt/mallocator.h -- api to recycle allocated objects                     */
 
 /* xbt/mallocator.h -- api to recycle allocated objects                     */
 

-/* Copyright (c) 2006-2007, 2009-2010, 2012-2014, 2018. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2006-2018. 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. */


@@ -9,8 +8,9 @@
 #ifndef XBT_MALLOCATOR_H
 #define XBT_MALLOCATOR_H
 
 #ifndef XBT_MALLOCATOR_H
 #define XBT_MALLOCATOR_H
 

-#include "xbt/function_types.h"
-#include "xbt/misc.h"
+#include <xbt/function_types.h>
+#include <xbt/misc.h>
+

 SG_BEGIN_DECL()
 
 /** @addtogroup XBT_mallocator
 SG_BEGIN_DECL()
 
 /** @addtogroup XBT_mallocator

diff --git a/include/xbt/misc.h b/include/xbt/misc.h
index 0aea069..c04f208 100644 (file)
--- a/include/xbt/misc.h
+++ b/include/xbt/misc.h
@@ -1,7 +1,6 @@
-/* xbt.h - Public interface to the xbt (simgrid's toolbox)                     */
+/* xbt.h - Public interface to the xbt (simgrid's toolbox)                  */

 
 

-/* Copyright (c) 2004-2018. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2004-2018. 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. */


@@ -9,9 +8,9 @@
 #ifndef XBT_MISC_H
 #define XBT_MISC_H
 
 #ifndef XBT_MISC_H
 #define XBT_MISC_H
 

-#include "simgrid_config.h"
-#include "base.h"
-#include "dynar.h"
+#include <simgrid_config.h>
+#include <xbt/base.h>
+#include <xbt/dynar.h>

 
 #include <stdarg.h>
 
 
 #include <stdarg.h>
 

diff --git a/include/xbt/replay.hpp b/include/xbt/replay.hpp
index dcbfa21..de1fbc5 100644 (file)
--- a/include/xbt/replay.hpp
+++ b/include/xbt/replay.hpp
@@ -1,7 +1,6 @@
 /* xbt/replay_reader.h -- Tools to parse a replay file                */
 
 /* xbt/replay_reader.h -- Tools to parse a replay file                */
 

-/* Copyright (c) 2010, 2012-2015, 2017-2018. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2010-2018. 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. */


@@ -9,7 +8,8 @@
 #ifndef XBT_REPLAY_HPP
 #define XBT_REPLAY_HPP
 
 #ifndef XBT_REPLAY_HPP
 #define XBT_REPLAY_HPP
 

-#include "xbt/misc.h" /* SG_BEGIN_DECL */
+#include <xbt/misc.h> /* SG_BEGIN_DECL */
+

 #ifdef __cplusplus
 #include <fstream>
 #include <queue>
 #ifdef __cplusplus
 #include <fstream>
 #include <queue>

diff --git a/include/xbt/str.h b/include/xbt/str.h
index 31b2fa1..20b9a65 100644 (file)
--- a/include/xbt/str.h
+++ b/include/xbt/str.h
@@ -1,7 +1,6 @@
 /* str.h - XBT string related functions.                                    */
 
 /* str.h - XBT string related functions.                                    */
 

-/* Copyright (c) 2007-2018. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2007-2018. 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. */


@@ -9,12 +8,11 @@
 #ifndef XBT_STR_H
 #define XBT_STR_H
 
 #ifndef XBT_STR_H
 #define XBT_STR_H
 

-#include "xbt/dict.h"
-#include "xbt/dynar.h"
-#include "xbt/misc.h"
+#include <xbt/dict.h>
+#include <xbt/dynar.h>
+#include <xbt/misc.h>

 
 

-#include <stdarg.h>             /* va_* */
-#include <stdio.h>  /* FILE */
+#include <stdarg.h> /* va_* */

 
 SG_BEGIN_DECL()
 
 
 SG_BEGIN_DECL()
 

diff --git a/include/xbt/synchro.h b/include/xbt/synchro.h
index 3a990f1..a03505a 100644 (file)
--- a/include/xbt/synchro.h
+++ b/include/xbt/synchro.h
@@ -8,8 +8,8 @@
 #ifndef XBT_THREAD_H
 #define XBT_THREAD_H
 
 #ifndef XBT_THREAD_H
 #define XBT_THREAD_H
 

-#include "xbt/function_types.h"
-#include "xbt/misc.h" /* SG_BEGIN_DECL */
+#include <xbt/function_types.h>
+#include <xbt/misc.h> /* SG_BEGIN_DECL */

 
 SG_BEGIN_DECL()
 
 
 SG_BEGIN_DECL()
 

diff --git a/include/xbt/sysdep.h b/include/xbt/sysdep.h
index d0b94e7..44ef89a 100644 (file)
--- a/include/xbt/sysdep.h
+++ b/include/xbt/sysdep.h
@@ -2,8 +2,7 @@
 /*  no system header should be loaded out of this file so that we have only */
 /*  one file to check when porting to another OS                            */
 
 /*  no system header should be loaded out of this file so that we have only */
 /*  one file to check when porting to another OS                            */
 

-/* Copyright (c) 2004-2018. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2004-2018. 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,11 +10,11 @@
 #ifndef XBT_SYSDEP_H
 #define XBT_SYSDEP_H
 
 #ifndef XBT_SYSDEP_H
 #define XBT_SYSDEP_H
 

-#include "xbt/log.h"
-#include "xbt/misc.h"
-#include "xbt/asserts.h"
+#include <xbt/asserts.h>
+#include <xbt/log.h>
+#include <xbt/misc.h>

 
 

-#include "simgrid_config.h"
+#include <simgrid_config.h>

 
 #include <string.h>
 #include <stdlib.h>
 
 #include <string.h>
 #include <stdlib.h>

diff --git a/include/xbt/virtu.h b/include/xbt/virtu.h
index 1386a56..834d39f 100644 (file)
--- a/include/xbt/virtu.h
+++ b/include/xbt/virtu.h
@@ -8,10 +8,10 @@
 #ifndef XBT_VIRTU_H
 #define XBT_VIRTU_H
 
 #ifndef XBT_VIRTU_H
 #define XBT_VIRTU_H
 

-#include "xbt/misc.h"
-#include "xbt/base.h"
-#include "xbt/function_types.h"
-#include "xbt/dynar.h"
+#include <xbt/base.h>
+#include <xbt/dynar.h>
+#include <xbt/function_types.h>
+#include <xbt/misc.h>

 
 SG_BEGIN_DECL()
 
 
 SG_BEGIN_DECL()
 

diff --git a/include/xbt/xbt_os_thread.h b/include/xbt/xbt_os_thread.h
index f0e976b..9c8c05e 100644 (file)
--- a/include/xbt/xbt_os_thread.h
+++ b/include/xbt/xbt_os_thread.h
@@ -8,11 +8,12 @@
 #ifndef XBT_OS_THREAD_H
 #define XBT_OS_THREAD_H
 
 #ifndef XBT_OS_THREAD_H
 #define XBT_OS_THREAD_H
 

-#include "xbt/base.h"
-

 SG_BEGIN_DECL()
 
 SG_BEGIN_DECL()
 

+#include <xbt/base.h>
+

 #include <pthread.h>
 #include <pthread.h>

+

 typedef pthread_key_t xbt_os_thread_key_t;
 
 /** @addtogroup XBT_thread
 typedef pthread_key_t xbt_os_thread_key_t;
 
 /** @addtogroup XBT_thread

diff --git a/src/xbt/snprintf.c b/src/xbt/snprintf.c
index c5fffcc..c6e841f 100644 (file)
--- a/src/xbt/snprintf.c
+++ b/src/xbt/snprintf.c
@@ -49,9 +49,15 @@
  *   http://www.ijs.si/software/snprintf/
  */
 
  *   http://www.ijs.si/software/snprintf/
  */
 

+/* find vasprintf in stdio.h */
+#ifndef _GNU_SOURCE
+#  define _GNU_SOURCE
+#endif
+#include <stdio.h>
+

 #include "xbt/sysdep.h"           /* xbt_abort() */
 #include "src/internal_config.h"  /* Do we need vasprintf? */
 #include "xbt/sysdep.h"           /* xbt_abort() */
 #include "src/internal_config.h"  /* Do we need vasprintf? */

-#include <stdio.h>
+

 #include <assert.h>
 
 #if !HAVE_VASPRINTF
 #include <assert.h>
 
 #if !HAVE_VASPRINTF

diff --git a/teshsuite/mc/random-bug/random-bug.c b/teshsuite/mc/random-bug/random-bug.c
index 9fbb738..b74603a 100644 (file)
--- a/teshsuite/mc/random-bug/random-bug.c
+++ b/teshsuite/mc/random-bug/random-bug.c
@@ -1,5 +1,4 @@
-/* Copyright (c) 2014-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2014-2018. 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. */


@@ -7,6 +6,8 @@
 #include <simgrid/msg.h>
 #include <simgrid/modelchecker.h>
 
 #include <simgrid/msg.h>
 #include <simgrid/modelchecker.h>
 

+#include <stdio.h> /* snprintf */
+

 XBT_LOG_NEW_DEFAULT_CATEGORY(random_bug, "Application");
 
 /** An (fake) application with a bug occuring for some random values */
 XBT_LOG_NEW_DEFAULT_CATEGORY(random_bug, "Application");
 
 /** An (fake) application with a bug occuring for some random values */

diff --git a/teshsuite/msg/actions-comm/actions-comm.c b/teshsuite/msg/actions-comm/actions-comm.c
index b431b35..a19af38 100644 (file)
--- a/teshsuite/msg/actions-comm/actions-comm.c
+++ b/teshsuite/msg/actions-comm/actions-comm.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2009-2018. 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. */


@@ -6,6 +6,8 @@
 #include <simgrid/msg.h>
 #include <xbt/replay.hpp>
 
 #include <simgrid/msg.h>
 #include <xbt/replay.hpp>
 

+#include <stdio.h> /* snprintf */
+

 XBT_LOG_NEW_DEFAULT_CATEGORY(actions, "Messages specific for this msg example");
 int communicator_size = 0;
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(actions, "Messages specific for this msg example");
 int communicator_size = 0;
 

diff --git a/teshsuite/msg/actions-storage/actions-storage.c b/teshsuite/msg/actions-storage/actions-storage.c
index e4cfac8..4c6e458 100644 (file)
--- a/teshsuite/msg/actions-storage/actions-storage.c
+++ b/teshsuite/msg/actions-storage/actions-storage.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2015-2018. 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. */


@@ -7,6 +7,8 @@
 #include "simgrid/plugins/file_system.h"
 #include <xbt/replay.hpp>
 
 #include "simgrid/plugins/file_system.h"
 #include <xbt/replay.hpp>
 

+#include <stdio.h> /* snprintf */
+

 XBT_LOG_NEW_DEFAULT_CATEGORY(storage_actions, "Messages specific for this example");
 
 static xbt_dict_t opened_files = NULL;
 XBT_LOG_NEW_DEFAULT_CATEGORY(storage_actions, "Messages specific for this example");
 
 static xbt_dict_t opened_files = NULL;

diff --git a/teshsuite/msg/app-bittorrent/bittorrent-messages.c b/teshsuite/msg/app-bittorrent/bittorrent-messages.c
index b735c70..540b6d5 100644 (file)
--- a/teshsuite/msg/app-bittorrent/bittorrent-messages.c
+++ b/teshsuite/msg/app-bittorrent/bittorrent-messages.c
@@ -1,5 +1,4 @@
-/* Copyright (c) 2012-2014. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2012-2018. 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. */


@@ -7,6 +6,8 @@
 #include "bittorrent-messages.h"
 #include "bittorrent.h"
 
 #include "bittorrent-messages.h"
 #include "bittorrent.h"
 

+#include <stdio.h> /* snprintf */
+

 XBT_LOG_NEW_DEFAULT_CATEGORY(msg_messages, "Messages specific for the message factory");
 
 #define BITS_TO_BYTES(x) (((x) / 8 + (x) % 8) ? 1 : 0)
 XBT_LOG_NEW_DEFAULT_CATEGORY(msg_messages, "Messages specific for the message factory");
 
 #define BITS_TO_BYTES(x) (((x) / 8 + (x) % 8) ? 1 : 0)

diff --git a/teshsuite/msg/app-bittorrent/bittorrent-peer.c b/teshsuite/msg/app-bittorrent/bittorrent-peer.c
index 3a6e22f..f74cdf3 100644 (file)
--- a/teshsuite/msg/app-bittorrent/bittorrent-peer.c
+++ b/teshsuite/msg/app-bittorrent/bittorrent-peer.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2012-2018. 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. */


@@ -7,10 +7,12 @@
 #include "bittorrent-messages.h"
 #include "connection.h"
 #include "tracker.h"
 #include "bittorrent-messages.h"
 #include "connection.h"
 #include "tracker.h"

-#include <limits.h>

 #include <simgrid/msg.h>
 #include <xbt/RngStream.h>
 
 #include <simgrid/msg.h>
 #include <xbt/RngStream.h>
 

+#include <limits.h>
+#include <stdio.h> /* snprintf */
+

 XBT_LOG_NEW_DEFAULT_CATEGORY(msg_peers, "Messages specific for the peers");
 
 /*
 XBT_LOG_NEW_DEFAULT_CATEGORY(msg_peers, "Messages specific for the peers");
 
 /*

diff --git a/teshsuite/msg/app-bittorrent/bittorrent.c b/teshsuite/msg/app-bittorrent/bittorrent.c
index 7cad511..d34d5d4 100644 (file)
--- a/teshsuite/msg/app-bittorrent/bittorrent.c
+++ b/teshsuite/msg/app-bittorrent/bittorrent.c
@@ -1,5 +1,4 @@
-/* Copyright (c) 2012-2017. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2012-2018. 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. */


@@ -10,6 +9,8 @@
 #include <simgrid/msg.h>
 #include <xbt/RngStream.h>
 
 #include <simgrid/msg.h>
 #include <xbt/RngStream.h>
 

+#include <stdio.h> /* snprintf */
+

 /** Bittorrent example launcher */
 int main(int argc, char* argv[])
 {
 /** Bittorrent example launcher */
 int main(int argc, char* argv[])
 {

diff --git a/teshsuite/msg/app-pingpong/app-pingpong.c b/teshsuite/msg/app-pingpong/app-pingpong.c
index c4ed0d5..1c97447 100644 (file)
--- a/teshsuite/msg/app-pingpong/app-pingpong.c
+++ b/teshsuite/msg/app-pingpong/app-pingpong.c
@@ -1,10 +1,12 @@
-/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2018. 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. */
 
 #include "simgrid/msg.h"
 
 
 /* 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 "simgrid/msg.h"
 

+#include <stdio.h> /* snprintf */
+

 XBT_LOG_NEW_DEFAULT_CATEGORY(msg_app_pingpong, "Messages specific for this msg example");
 
 static int pinger(int argc, char* argv[])
 XBT_LOG_NEW_DEFAULT_CATEGORY(msg_app_pingpong, "Messages specific for this msg example");
 
 static int pinger(int argc, char* argv[])

diff --git a/teshsuite/msg/app-token-ring/app-token-ring.c b/teshsuite/msg/app-token-ring/app-token-ring.c
index 5018672..013e9c3 100644 (file)
--- a/teshsuite/msg/app-token-ring/app-token-ring.c
+++ b/teshsuite/msg/app-token-ring/app-token-ring.c
@@ -1,10 +1,12 @@
-/* Copyright (c) 2008-2016. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2008-2018. 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. */
 
 #include "simgrid/msg.h"
 
 
 /* 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 "simgrid/msg.h"
 

+#include <stdio.h> /* snprintf */
+

 XBT_LOG_NEW_DEFAULT_CATEGORY(msg_app_token_ring, "Messages specific for this msg example");
 
 /* Main function of all processes used in this example */
 XBT_LOG_NEW_DEFAULT_CATEGORY(msg_app_token_ring, "Messages specific for this msg example");
 
 /* Main function of all processes used in this example */

diff --git a/teshsuite/msg/async-wait/async-wait.c b/teshsuite/msg/async-wait/async-wait.c
index beb85ca..826bb5b 100644 (file)
--- a/teshsuite/msg/async-wait/async-wait.c
+++ b/teshsuite/msg/async-wait/async-wait.c
@@ -1,10 +1,12 @@
-/* Copyright (c) 2010-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2010-2018. 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. */
 
 #include "simgrid/msg.h"
 
 
 /* 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 "simgrid/msg.h"
 

+#include <stdio.h> /* snprintf */
+

 XBT_LOG_NEW_DEFAULT_CATEGORY(msg_async_wait, "Messages specific for this msg example");
 
 /* Main function of the Sender process */
 XBT_LOG_NEW_DEFAULT_CATEGORY(msg_async_wait, "Messages specific for this msg example");
 
 /* Main function of the Sender process */

diff --git a/teshsuite/msg/async-waitall/async-waitall.c b/teshsuite/msg/async-waitall/async-waitall.c
index b586690..abb6615 100644 (file)
--- a/teshsuite/msg/async-waitall/async-waitall.c
+++ b/teshsuite/msg/async-waitall/async-waitall.c
@@ -1,10 +1,12 @@
-/* Copyright (c) 2010-2016. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2010-2018. 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. */
 
 #include "simgrid/msg.h"
 
 
 /* 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 "simgrid/msg.h"
 

+#include <stdio.h> /* snprintf */
+

 XBT_LOG_NEW_DEFAULT_CATEGORY(msg_async_waitall, "Messages specific for this msg example");
 
 static int sender(int argc, char* argv[])
 XBT_LOG_NEW_DEFAULT_CATEGORY(msg_async_waitall, "Messages specific for this msg example");
 
 static int sender(int argc, char* argv[])

diff --git a/teshsuite/msg/async-waitany/async-waitany.c b/teshsuite/msg/async-waitany/async-waitany.c
index 2ae48e6..9eb12ed 100644 (file)
--- a/teshsuite/msg/async-waitany/async-waitany.c
+++ b/teshsuite/msg/async-waitany/async-waitany.c
@@ -1,10 +1,12 @@
-/* Copyright (c) 2010-2016. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2010-2018. 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. */
 
 #include "simgrid/msg.h"
 
 
 /* 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 "simgrid/msg.h"
 

+#include <stdio.h> /* snprintf */
+

 XBT_LOG_NEW_DEFAULT_CATEGORY(msg_async_waitany, "Messages specific for this msg example");
 
 static int sender(int argc, char* argv[])
 XBT_LOG_NEW_DEFAULT_CATEGORY(msg_async_waitany, "Messages specific for this msg example");
 
 static int sender(int argc, char* argv[])

diff --git a/teshsuite/msg/host_on_off_processes/host_on_off_processes.c b/teshsuite/msg/host_on_off_processes/host_on_off_processes.c
index 10ab828..a13d6b4 100644 (file)
--- a/teshsuite/msg/host_on_off_processes/host_on_off_processes.c
+++ b/teshsuite/msg/host_on_off_processes/host_on_off_processes.c
@@ -1,10 +1,12 @@
-/* Copyright (c) 2010-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2010-2018. 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. */
 
 #include "simgrid/msg.h"
 
 
 /* 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 "simgrid/msg.h"
 

+#include <stdio.h> /* sscanf */
+

 XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test, "Messages specific for this msg example");
 
 xbt_dynar_t tests;
 XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test, "Messages specific for this msg example");
 
 xbt_dynar_t tests;

diff --git a/teshsuite/msg/io-file-remote/io-file-remote.c b/teshsuite/msg/io-file-remote/io-file-remote.c
index 0726701..6b098a9 100644 (file)
--- a/teshsuite/msg/io-file-remote/io-file-remote.c
+++ b/teshsuite/msg/io-file-remote/io-file-remote.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2014-2016. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2014-2018. 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. */


@@ -6,6 +6,8 @@
 #include "simgrid/msg.h"
 #include <simgrid/plugins/file_system.h>
 
 #include "simgrid/msg.h"
 #include <simgrid/plugins/file_system.h>
 

+#include <stdio.h> /* sscanf */
+

 #define INMEGA (1024 * 1024)
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(remote_io, "Messages specific for this io example");
 #define INMEGA (1024 * 1024)
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(remote_io, "Messages specific for this io example");

diff --git a/teshsuite/msg/io-file/io-file.c b/teshsuite/msg/io-file/io-file.c
index 2c22834..2b44583 100644 (file)
--- a/teshsuite/msg/io-file/io-file.c
+++ b/teshsuite/msg/io-file/io-file.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008-2016. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2008-2018. 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. */


@@ -6,6 +6,8 @@
 #include "simgrid/msg.h"
 #include "simgrid/plugins/file_system.h"
 
 #include "simgrid/msg.h"
 #include "simgrid/plugins/file_system.h"
 

+#include <stdio.h> /* SEEK_SET */
+

 XBT_LOG_NEW_DEFAULT_CATEGORY(io_file, "Messages specific for this io example");
 
 static int host(int argc, char* argv[])
 XBT_LOG_NEW_DEFAULT_CATEGORY(io_file, "Messages specific for this io example");
 
 static int host(int argc, char* argv[])

diff --git a/teshsuite/msg/process-lifetime/process-lifetime.c b/teshsuite/msg/process-lifetime/process-lifetime.c
index 5514c92..f20bf79 100644 (file)
--- a/teshsuite/msg/process-lifetime/process-lifetime.c
+++ b/teshsuite/msg/process-lifetime/process-lifetime.c
@@ -1,10 +1,12 @@
-/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2018. 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. */
 
 #include "simgrid/msg.h"
 
 
 /* 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 "simgrid/msg.h"
 

+#include <stdio.h> /* snprintf */
+

 XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test, "Messages specific for this msg example");
 
 /* Executed on process termination*/
 XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test, "Messages specific for this msg example");
 
 /* Executed on process termination*/

diff --git a/teshsuite/msg/process-yield/process-yield.c b/teshsuite/msg/process-yield/process-yield.c
index ada22e3..c6a6acb 100644 (file)
--- a/teshsuite/msg/process-yield/process-yield.c
+++ b/teshsuite/msg/process-yield/process-yield.c
@@ -1,10 +1,12 @@
-/* Copyright (c) 2017. The SimGrid Team. All rights reserved.               */
+/* Copyright (c) 2017-2018. 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. */
 
 #include "simgrid/msg.h"
 
 
 /* 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 "simgrid/msg.h"
 

+#include <stdio.h> /* snprintf */
+

 /* This example does not much: It just spans over-polite processes that yield a large amount
  * of time before ending.
  *
 /* This example does not much: It just spans over-polite processes that yield a large amount
  * of time before ending.
  *

diff --git a/teshsuite/msg/task_progress/task_progress.cpp b/teshsuite/msg/task_progress/task_progress.cpp
index adf5200..3971b80 100644 (file)
--- a/teshsuite/msg/task_progress/task_progress.cpp
+++ b/teshsuite/msg/task_progress/task_progress.cpp
@@ -1,5 +1,4 @@
-/* Copyright (c) 2010-2017. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2010-2018. 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. */


@@ -7,6 +6,8 @@
 #include <xbt/ex.hpp>
 #include "simgrid/msg.h"
 
 #include <xbt/ex.hpp>
 #include "simgrid/msg.h"
 

+#include <stdio.h> /* snprintf */
+

 XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test, "Messages specific for this msg example");
 
 static std::vector<msg_task_t> tasks = std::vector<msg_task_t>();
 XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test, "Messages specific for this msg example");
 
 static std::vector<msg_task_t> tasks = std::vector<msg_task_t>();

diff --git a/teshsuite/xbt/mallocator/mallocator.c b/teshsuite/xbt/mallocator/mallocator.c
index 180b254..d8e3ffb 100644 (file)
--- a/teshsuite/xbt/mallocator/mallocator.c
+++ b/teshsuite/xbt/mallocator/mallocator.c
@@ -1,6 +1,8 @@
 #include "xbt/mallocator.h"
 #include "xbt.h"
 
 #include "xbt/mallocator.h"
 #include "xbt.h"
 

+#include <stdio.h> /* snprintf */
+

 typedef struct element {
   int value;
 } s_element_t;
 typedef struct element {
   int value;
 } s_element_t;

diff --git a/teshsuite/xbt/parallel_log_crashtest/parallel_log_crashtest.c b/teshsuite/xbt/parallel_log_crashtest/parallel_log_crashtest.c
index dc86382..a39cf7d 100644 (file)
--- a/teshsuite/xbt/parallel_log_crashtest/parallel_log_crashtest.c
+++ b/teshsuite/xbt/parallel_log_crashtest/parallel_log_crashtest.c
@@ -1,7 +1,6 @@
 /* synchro_crashtest -- tries to crash the logging mechanism by doing parallel logs*/
 
 /* synchro_crashtest -- tries to crash the logging mechanism by doing parallel logs*/
 

-/* Copyright (c) 2007-2017. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2007-2018. 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. */


@@ -9,6 +8,8 @@
 #include "simgrid/msg.h"
 #include "xbt.h"
 
 #include "simgrid/msg.h"
 #include "xbt.h"
 

+#include <stdio.h> /* snprintf */
+

 XBT_LOG_NEW_DEFAULT_CATEGORY(synchro_crashtest, "Logs of this example");
 
 const int test_amount    = 99;  /* Up to 99 to not break the logs (and thus the testing mechanism) */
 XBT_LOG_NEW_DEFAULT_CATEGORY(synchro_crashtest, "Logs of this example");
 
 const int test_amount    = 99;  /* Up to 99 to not break the logs (and thus the testing mechanism) */