A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'oldstyle_element_set'
[simgrid.git]
/
include
/
simgrid
/
jedule
/
jedule_events.h
diff --git
a/include/simgrid/jedule/jedule_events.h
b/include/simgrid/jedule/jedule_events.h
index
1e88da8
..
1e6a87b
100644
(file)
--- a/
include/simgrid/jedule/jedule_events.h
+++ b/
include/simgrid/jedule/jedule_events.h
@@
-1,4
+1,4
@@
-/* Copyright (c) 2010-2012, 2014. The SimGrid Team.
+/* Copyright (c) 2010-2012, 2014
-2015
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-12,11
+12,13
@@
#include "xbt/dynar.h"
#include "xbt/dict.h"
#include "xbt/dynar.h"
#include "xbt/dict.h"
-#include "
instr
/jedule/jedule_platform.h"
+#include "
simgrid
/jedule/jedule_platform.h"
#ifdef HAVE_JEDULE
#ifdef HAVE_JEDULE
+SG_BEGIN_DECL()
+
struct jed_event {
int event_id;
char *name;
struct jed_event {
int event_id;
char *name;
@@
-42,6
+44,8
@@
void jed_event_add_characteristic(jed_event_t event, char *characteristic);
void jed_event_add_info(jed_event_t event, char *key, char *value);
void jed_event_add_info(jed_event_t event, char *key, char *value);
+SG_END_DECL()
+
#endif
#endif /* JEDULE_EVENTS_H_ */
#endif
#endif /* JEDULE_EVENTS_H_ */