From f297c9dd6b6f32b6386d2e9b329740d13948f4a4 Mon Sep 17 00:00:00 2001
From: Martin Quinson <martin.quinson@ens-rennes.fr>
Date: Thu, 27 Dec 2018 11:32:03 +0100
Subject: [PATCH] Drop sg_cmdline. Please use xbt_cmdline instead (+include
 reduction)

---
 ChangeLog                              | 3 +++
 include/smpi/smpi.h                    | 6 ++++--
 include/xbt/misc.h                     | 5 -----
 src/instr/instr_config.cpp             | 3 ++-
 src/smpi/mpi/smpi_datatype_derived.cpp | 2 ++
 5 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9ecffb07e2..121fc47a34 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,9 @@ MSG:
    This C++ function was a pimple in the C API, made necessary at some
    point by the Java bindings. This is fixed now.
 
+XBT:
+ - Drop sg_cmdline. Please use xbt_cmdline instead.
+
 Fixed bugs:
  - #261: Document the parameters of parallel execution's constructor
  - #314: SMPI args internal cleanup
diff --git a/include/smpi/smpi.h b/include/smpi/smpi.h
index 8128abfa54..a4ff7c8c9f 100644
--- a/include/smpi/smpi.h
+++ b/include/smpi/smpi.h
@@ -6,11 +6,13 @@
 #ifndef SMPI_H
 #define SMPI_H
 
-#include <unistd.h>
-#include <sys/time.h>
 #include <simgrid/forward.h>
 #include <smpi/forward.hpp>
+#include <xbt/function_types.h>
+
 #include <stddef.h>
+#include <sys/time.h>
+#include <unistd.h>
 #include <xbt/misc.h>
 
 #ifdef _WIN32
diff --git a/include/xbt/misc.h b/include/xbt/misc.h
index 7af14159c6..48015b4267 100644
--- a/include/xbt/misc.h
+++ b/include/xbt/misc.h
@@ -8,9 +8,7 @@
 #ifndef XBT_MISC_H
 #define XBT_MISC_H
 
-#include <simgrid/config.h>
 #include <xbt/base.h>
-#include <xbt/dynar.h>
 
 #include <stdarg.h>
 
@@ -25,9 +23,6 @@ XBT_PUBLIC_DATA int xbt_pagebits;
 /** Helps ensuring that header version (SIMGRID_VERSION_MAJOR and friends) and dynamic library version do match. */
 XBT_PUBLIC void sg_version_check(int lib_version_major, int lib_version_minor, int lib_version_patch);
 
-/** Contains all the parameters we got from the command line */
-XBT_PUBLIC_DATA xbt_dynar_t sg_cmdline;
-
 /* snprintf related functions */
 /** @addtogroup XBT_str
   * @{ */
diff --git a/src/instr/instr_config.cpp b/src/instr/instr_config.cpp
index 2522bfb92e..7ac0a9ccf1 100644
--- a/src/instr/instr_config.cpp
+++ b/src/instr/instr_config.cpp
@@ -7,7 +7,8 @@
 #include "simgrid/s4u/Engine.hpp"
 #include "src/instr/instr_private.hpp"
 #include "surf/surf.hpp"
-#include "xbt/virtu.h" /* sg_cmdline */
+#include "xbt/virtu.h" /* xbt_cmdline */
+
 #include <fstream>
 #include <string>
 #include <vector>
diff --git a/src/smpi/mpi/smpi_datatype_derived.cpp b/src/smpi/mpi/smpi_datatype_derived.cpp
index 5bde9a624a..6aa6b88ecd 100644
--- a/src/smpi/mpi/smpi_datatype_derived.cpp
+++ b/src/smpi/mpi/smpi_datatype_derived.cpp
@@ -8,6 +8,8 @@
 #include "smpi_op.hpp"
 #include <xbt/log.h>
 
+#include <cstring>
+
 namespace simgrid{
 namespace smpi{
 
-- 
2.20.1