From: Martin Quinson <martin.quinson@loria.fr>
Date: Sat, 14 Jul 2018 17:50:18 +0000 (+0200)
Subject: fix the C inclusion of simix.h, once again
X-Git-Tag: v3_21~436
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/d0deeb7395b0acb0b56550d62bc26df529779ef4?ds=sidebyside

fix the C inclusion of simix.h, once again
---

diff --git a/include/simgrid/simix.h b/include/simgrid/simix.h
index e6e920348e..bef172b811 100644
--- a/include/simgrid/simix.h
+++ b/include/simgrid/simix.h
@@ -191,11 +191,13 @@ XBT_PUBLIC void SIMIX_comm_finish(smx_activity_t synchro);
 /******************************************************************************/
 
 /******************************* Host simcalls ********************************/
+#ifdef __cplusplus
 XBT_PUBLIC smx_activity_t simcall_execution_start(std::string name, double flops_amount, double priority, double bound,
                                                   sg_host_t host);
 XBT_PUBLIC smx_activity_t simcall_execution_parallel_start(std::string name, int host_nb, sg_host_t* host_list,
                                                            double* flops_amount, double* bytes_amount, double rate,
                                                            double timeout);
+#endif
 XBT_PUBLIC void simcall_execution_cancel(smx_activity_t execution);
 XBT_PUBLIC void simcall_execution_set_priority(smx_activity_t execution, double priority);
 XBT_PUBLIC void simcall_execution_set_bound(smx_activity_t execution, double bound);
diff --git a/teshsuite/xbt/cmdline/cmdline.c b/teshsuite/xbt/cmdline/cmdline.c
index bda54bc1fc..3faaa715db 100644
--- a/teshsuite/xbt/cmdline/cmdline.c
+++ b/teshsuite/xbt/cmdline/cmdline.c
@@ -4,6 +4,7 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "simgrid/engine.h"
+#include "simgrid/simix.h" // we don't need it, but someone must check that this file is actually usable in plain C
 #include <xbt.h>
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(test, "Logging specific to this test");