Some further 32/64bit printing error fixes.

diff --git a/src/epg.c b/src/epg.c
index 78c6847f62a49aadd2d4ea1374b90a5d9271264a..35056a3bd06e502d6413cfc45fbe69d6a3ad0abf 100644 (file)
--- a/src/epg.c
+++ b/src/epg.c
@@ -1146,7 +1146,7 @@ static void _epg_channel_timer_callback ( void *p )
     /* Expire */
     if ( ebc->stop <= dispatch_clock ) {
       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->putref((epg_object_t*)ebc);
       continue; // skip to next
@@ -1171,7 +1171,7 @@ static void _epg_channel_timer_callback ( void *p )
 
   /* re-arm */
   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);
     gtimer_arm_abs(&ch->ch_epg_timer, _epg_channel_timer_callback, ch, next);
   }

diff --git a/src/tvheadend.h b/src/tvheadend.h
index ae10afd137f71cc67d62b96a8aa8781f10c80744..b5bff53bcb1df16a93b01ff4ec1b10e0c2c26543 100644 (file)
--- a/src/tvheadend.h
+++ b/src/tvheadend.h
@@ -451,4 +451,11 @@ void sbuf_put_byte(sbuf_t *sb, uint8_t u8);
 
 char *md5sum ( const char *str );
 
+/* printing */
+#if __SIZEOF_LONG__ == 8
+  #define PRItime_t PRIu64
+#else
+  #define PRItime_t PRIu32
+#endif
+
 #endif /* TV_HEAD_H */