From: Martin Quinson <martin.quinson@ens-rennes.fr>
Date: Fri, 26 Jul 2019 13:47:34 +0000 (+0200)
Subject: Make SG_BARRIER_SERIAL_THREAD visible from C files too
X-Git-Tag: v3.24~251
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/9c5c9cd1b50644d19ccb014877aef649f2c4b1b5

Make SG_BARRIER_SERIAL_THREAD visible from C files too

Fix https://framagit.org/simgrid/simgrid/issues/34 again, hopefully
properly this time.
---

diff --git a/include/simgrid/barrier.h b/include/simgrid/barrier.h
index 9c068bee7e..2837633ebd 100644
--- a/include/simgrid/barrier.h
+++ b/include/simgrid/barrier.h
@@ -10,6 +10,12 @@
 
 #include <simgrid/forward.h>
 
+#ifdef __cplusplus
+constexpr int SG_BARRIER_SERIAL_THREAD = -1;
+#else
+#define SG_BARRIER_SERIAL_THREAD -1
+#endif
+
 /* C interface */
 SG_BEGIN_DECL()
 
diff --git a/include/simgrid/s4u/Barrier.hpp b/include/simgrid/s4u/Barrier.hpp
index 85e2c0564c..6a2dcb7a9d 100644
--- a/include/simgrid/s4u/Barrier.hpp
+++ b/include/simgrid/s4u/Barrier.hpp
@@ -6,16 +6,15 @@
 #ifndef SIMGRID_S4U_BARRIER_HPP
 #define SIMGRID_S4U_BARRIER_HPP
 
+#include <simgrid/barrier.h>
+#include <simgrid/chrono.hpp>
 #include <simgrid/forward.h>
 #include <simgrid/s4u/ConditionVariable.hpp>
-#include <simgrid/chrono.hpp>
 #include <simgrid/s4u/Mutex.hpp>
 
 #include <atomic>
 #include <future>
 
-constexpr int SG_BARRIER_SERIAL_THREAD = -1;
-
 namespace simgrid {
 namespace s4u {