From: Adam Sutton <dev@adamsutton.me.uk>
Date: Wed, 20 Jun 2012 14:10:53 +0000 (+0100)
Subject: Some further 32/64bit printing error fixes.
X-Git-Tag: 3.3~219^2~54
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3cb24699c2d71a4449ec0077ee957b4498cb8742;p=thirdparty%2Ftvheadend.git

Some further 32/64bit printing error fixes.
---

diff --git a/src/epg.c b/src/epg.c
index 78c6847f6..35056a3bd 100644
--- 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 ae10afd13..b5bff53bc 100644
--- 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 */