# HG changeset patch # User Florian Pose # Date 1222850684 0 # Node ID 33e8349b44bd73a3d846e152dcfa1ebd8eb49499 # Parent 5007e4913a4ce319dcd26c008a194a1f8d2593b0 Avoided using #ifdef inside a macro. diff -r 5007e4913a4c -r 33e8349b44bd master/master.c --- a/master/master.c Wed Oct 01 08:40:30 2008 +0000 +++ b/master/master.c Wed Oct 01 08:44:44 2008 +0000 @@ -1377,16 +1377,15 @@ ec_master_output_stats(master); if (unlikely(master->debug_level > 0)) { + unsigned int time_us; +#ifdef EC_HAVE_CYCLES + time_us = (unsigned int) (master->main_device.cycles_poll - + datagram->cycles_sent) * 1000 / cpu_khz; +#else + time_us = (unsigned int) (diff_ms * 1000); +#endif EC_DBG("TIMED OUT datagram %08x, index %02X waited %u us.\n", - (unsigned int) datagram, datagram->index, -#ifdef EC_HAVE_CYCLES - (unsigned int) (master->main_device.cycles_poll - - datagram->cycles_sent) * 1000 / cpu_khz -#else - (unsigned int) (diff_ms * 1000) -#endif - ); - + (unsigned int) datagram, datagram->index, time_us); } } }