resolve merge conflict

[simgrid.git] / include / instr / jedule / jedule_events.h

diff --git a/include/instr/jedule/jedule_events.h b/include/instr/jedule/jedule_events.h
index 4d5b295..9ea2893 100644 (file)
--- a/include/instr/jedule/jedule_events.h
+++ b/include/instr/jedule/jedule_events.h
@@ -8,11 +8,16 @@
 #ifndef JEDULE_EVENTS_H_
 #define JEDULE_EVENTS_H_
 
-#include "jedule_platform.h"
+#include "simgrid_config.h"
 
 #include "xbt/dynar.h"
 #include "xbt/dict.h"
 
+#include "instr/jedule/jedule_platform.h"
+
+
+#ifdef HAVE_JEDULE
+
 struct jed_event {
        int event_id;
        char *name;
@@ -28,7 +33,7 @@ typedef struct jed_event s_jed_event_t, *jed_event_t;
 
 /************************************************************/
 
-void create_jed_event(jed_event_t *event, char *name, double start_time, double end_time, char *type);
+void create_jed_event(jed_event_t *event, char *name, double start_time, double end_time, const char *type);
 
 void jed_event_free(jed_event_t event);
 
@@ -38,4 +43,6 @@ void jed_event_add_characteristic(jed_event_t event, char *characteristic);
 
 void jed_event_add_info(jed_event_t event, char *key, char *value);
 
+#endif
+
 #endif /* JEDULE_EVENTS_H_ */