# HG changeset patch # User etisserant # Date 1190646515 -7200 # Node ID 805abb954de21d8cdce68f6059ee06a869343b64 # Parent eaffcd0a2f037c413fc33e078575bd0340df9d54 removed timer_notify conflict with CanFestival diff -r eaffcd0a2f03 -r 805abb954de2 runtime/plc_Linux_main.c --- a/runtime/plc_Linux_main.c Mon Sep 24 17:07:42 2007 +0200 +++ b/runtime/plc_Linux_main.c Mon Sep 24 17:08:35 2007 +0200 @@ -4,7 +4,7 @@ #include -void timer_notify(sigval_t val) +void PLC_timer_notify(sigval_t val) { struct timespec CURRENT_TIME; clock_gettime(CLOCK_REALTIME, &CURRENT_TIME); @@ -31,7 +31,7 @@ sigev.sigev_value.sival_int = 0; sigev.sigev_notify = SIGEV_THREAD; sigev.sigev_notify_attributes = NULL; - sigev.sigev_notify_function = timer_notify; + sigev.sigev_notify_function = PLC_timer_notify; timerValues.it_value.tv_sec = tv_sec; timerValues.it_value.tv_nsec = tv_nsec; timerValues.it_interval.tv_sec = tv_sec;