Commit b3dd47d2 authored by Jonathan Jenkins's avatar Jonathan Jenkins

fix linker error in certain cases with model-net

same var name used for the "sequencing" macros
parent f8e08380
......@@ -16,14 +16,14 @@
* delay, but that is hacky as well (and relies on knowing bounds on internal
* codes_local_latency bounds. Hence, expose explicit start-sequence and
* stop-sequence markers */
extern int in_sequence;
extern int lsm_in_sequence;
extern tw_stime lsm_msg_offset;
#define LSM_START_SEQ() do {\
in_sequence = 1; \
lsm_in_sequence = 1; \
lsm_msg_offset = 0.0; \
} while (0)
#define LSM_END_SEQ() do {\
in_sequence = 0;\
lsm_in_sequence = 0;\
} while (0)
/*
......
......@@ -17,8 +17,8 @@
#define CATEGORY_NAME_MAX 16
#define CATEGORY_MAX 12
int in_sequence = 0;
tw_stime mn_msg_offset = 0.0;
int lsm_in_sequence = 0;
tw_stime lsm_msg_offset = 0.0;
/*
* wrapped_event_t
......@@ -307,7 +307,7 @@ tw_event* lsm_event_new(const char* category,
lsm_gid = lsm_find_local_device(sender);
delta = codes_local_latency(sender) + delay;
if (in_sequence) {
if (lsm_in_sequence) {
tw_stime tmp = lsm_msg_offset;
lsm_msg_offset += delta;
delta += tmp;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment