kill duplicate definitions, and try to ensure that MC-ready code still works without...

diff --git a/include/simgrid/modelchecker.h b/include/simgrid/modelchecker.h
index b0d7a37..f07d42e 100644 (file)
--- a/include/simgrid/modelchecker.h
+++ b/include/simgrid/modelchecker.h
@@ -12,16 +12,23 @@
 #define SIMGRID_MODELCHECKER_H
 
 #ifdef HAVE_MC
 #define SIMGRID_MODELCHECKER_H
 
 #ifdef HAVE_MC

+

 extern int _surf_do_model_check;
 #define MC_IS_ENABLED _surf_do_model_check
 extern int _surf_do_model_check;
 #define MC_IS_ENABLED _surf_do_model_check

-#else
-#define MC_IS_ENABLED 0
-#endif
-

 
 XBT_PUBLIC(void) MC_assert(int);
 XBT_PUBLIC(void) MC_assert_stateful(int);
 XBT_PUBLIC(int) MC_random(int min, int max);
 XBT_PUBLIC(void) MC_diff();
 
 
 XBT_PUBLIC(void) MC_assert(int);
 XBT_PUBLIC(void) MC_assert_stateful(int);
 XBT_PUBLIC(int) MC_random(int min, int max);
 XBT_PUBLIC(void) MC_diff();
 

+#else
+
+#define MC_IS_ENABLED 0
+#define MC_assert(a) xbt_assert(a)
+#define MC_assert_stateful(a) xbt_assert(a)
+
+#endif
+
+
+

 #endif /* SIMGRID_MODELCHECKER_H */
 #endif /* SIMGRID_MODELCHECKER_H */

diff --git a/src/include/mc/mc.h b/src/include/mc/mc.h
index bffb7e6..10b7691 100644 (file)
--- a/src/include/mc/mc.h
+++ b/src/include/mc/mc.h
@@ -12,15 +12,9 @@
 #include "xbt/function_types.h"
 #include "mc/datatypes.h"
 #include "simix/datatypes.h"
 #include "xbt/function_types.h"
 #include "mc/datatypes.h"
 #include "simix/datatypes.h"

-#include "gras_config.h" /* Definition of HAVE_MC */
+#include "simgrid/modelchecker.h" /* our public interface (and definition of HAVE_MC) */

 #include "xbt/automaton.h"
 
 #include "xbt/automaton.h"
 

-#ifdef HAVE_MC
-extern int _surf_do_model_check;
-#define MC_IS_ENABLED _surf_do_model_check
-#else
-#define MC_IS_ENABLED 0
-#endif

 
 SG_BEGIN_DECL()
 
 
 SG_BEGIN_DECL()