stv0g/tvheadend
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Some further 32/64bit printing error fixes.

Browse source
This commit is contained in:
Adam Sutton 2012-06-20 15:10:53 +01:00
parent e479a0b755
commit 32dd556cc8
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/epg.c
View file

@ -1249,7 +1249,7 @@ static void _epg_channel_timer_callback ( void *p )
/* Expire */ /* Expire */
if ( ebc->stop <= dispatch_clock ) { if ( ebc->stop <= dispatch_clock ) {
RB_REMOVE(&ch->ch_epg_schedule, ebc, sched_link); RB_REMOVE(&ch->ch_epg_schedule, ebc, sched_link);
tvhlog(LOG_DEBUG, "epg", "expire event %"PRIu64" from %s", tvhlog(LOG_DEBUG, "epg", "expire event %"PRItime_t" from %s",
ebc->id, ch->ch_name); ebc->id, ch->ch_name);
ebc->putref((epg_object_t*)ebc); ebc->putref((epg_object_t*)ebc);
continue; // skip to next continue; // skip to next
@ -1274,7 +1274,7 @@ static void _epg_channel_timer_callback ( void *p )
/* re-arm */ /* re-arm */
if ( next ) { if ( next ) {
tvhlog(LOG_DEBUG, "epg", "arm channel timer @ %"PRIu64" for %s", tvhlog(LOG_DEBUG, "epg", "arm channel timer @ %"PRItime_t" for %s",
next, ch->ch_name); next, ch->ch_name);
gtimer_arm_abs(&ch->ch_epg_timer, _epg_channel_timer_callback, ch, next); gtimer_arm_abs(&ch->ch_epg_timer, _epg_channel_timer_callback, ch, next);
} }

7
src/tvheadend.h
View file

@ -451,4 +451,11 @@ void sbuf_put_byte(sbuf_t *sb, uint8_t u8);
char *md5sum ( const char *str ); char *md5sum ( const char *str );
/* printing */
#if __SIZEOF_LONG__ == 8
#define PRItime_t PRIu64
#else
#define PRItime_t PRIu32
#endif
#endif /* TV_HEAD_H */ #endif /* TV_HEAD_H */