Revert "fix for 64bit time_t on 32bit systems"

This reverts commit 76a6263f1be4e3ccff968b47155b050fcc15f042.

diff --git a/src/epggrab/otamux.c b/src/epggrab/otamux.c
index 6078cd73565de7e94c34b673e70a01453552d418..4888158bab7e087aef7e8f1624934fe48b62ae37 100644 (file)
--- a/src/epggrab/otamux.c
+++ b/src/epggrab/otamux.c
@@ -723,7 +723,7 @@ epggrab_ota_start_cb ( void *p );
 static void
 epggrab_ota_next_arm( time_t next )
 {
-  tvhtrace(LS_EPGGRAB, "next ota start event in %"PRId64" seconds", next - time(NULL));
+  tvhtrace(LS_EPGGRAB, "next ota start event in %li seconds", next - time(NULL));
   gtimer_arm_absn(&epggrab_ota_start_timer, epggrab_ota_start_cb, NULL, next);
   dbus_emit_signal_s64("/epggrab/ota", "next", next);
 }

diff --git a/src/tvheadend.h b/src/tvheadend.h
index 79fe55e25eb78116bd564968325611b39a67f922..8a7965235d5489dfd94689f647d2fad3f80a9f8a 100644 (file)
--- a/src/tvheadend.h
+++ b/src/tvheadend.h
@@ -337,7 +337,7 @@ void tvh_qsort_r(void *base, size_t nmemb, size_t size, int (*compar)(const void
 #if __WORDSIZE == 32 && defined(PLATFORM_FREEBSD)
 #define PRItime_t       "d"
 #else
-#define PRItime_t       PRId64
+#define PRItime_t       "ld"
 #endif
 
 /* transcoding */