[pypy-commit] stmgc c8-adaptive-trx-length: Fix name clash in macro expansion

[tobweber]

Author: Tobias Weber <tobias_weber89 at gmx.de>
Branch: c8-adaptive-trx-length
Changeset: r2048:78f3434d68d5
Date: 2017-04-29 16:24 +0200
http://bitbucket.org/pypy/stmgc/changeset/78f3434d68d5/

Log:	Fix name clash in macro expansion

diff --git a/c8/stm/timing.h b/c8/stm/timing.h
--- a/c8/stm/timing.h
+++ b/c8/stm/timing.h
@@ -27,9 +27,9 @@
 #define pause_timer() clock_gettime(CLOCK_MONOTONIC_RAW, &stop);            \
                       get_duration()
 
-#define stm_duration_payload(duration)                                      \
+#define stm_duration_payload(duration_data)                                 \
     stm_timing_event_payload_data_t stm_duration_data =                     \
-        { .duration = &duration };                                          \
+        { .duration = &duration_data };                                     \
     stm_timing_event_payload_t stm_duration_payload =                       \
         { STM_EVENT_PAYLOAD_DURATION, stm_duration_data };