diff --git a/src/input/mpegts/dvb_psi.c b/src/input/mpegts/dvb_psi.c index 44c2a680..a4e5c6d5 100644 --- a/src/input/mpegts/dvb_psi.c +++ b/src/input/mpegts/dvb_psi.c @@ -471,7 +471,7 @@ dvb_table_end for (sa = 0; sa < 8; sa++) rem |= st->sections[sa]; if (rem) return -1; - tvhtrace(mt->mt_name, " tableid %02X extraid %016lX completed", + tvhtrace(mt->mt_name, " tableid %02X extraid %016" PRIx64 " completed", st->tableid, st->extraid); st->complete = 1; mt->mt_incomplete--; @@ -503,7 +503,7 @@ dvb_table_begin if((ptr[2] & 1) == 0) return -1; - tvhtrace(mt->mt_name, "pid %02X tableid %02X extraid %016lX len %d", + tvhtrace(mt->mt_name, "pid %02X tableid %02X extraid %016" PRIx64 " len %d", mt->mt_pid, tableid, extraid, len); /* Section info */ diff --git a/src/trap.c b/src/trap.c index 7a731d30..6a81ba9c 100644 --- a/src/trap.c +++ b/src/trap.c @@ -173,11 +173,7 @@ traphandler(int sig, siginfo_t *si, void *UC) snprintf(tmpbuf, sizeof(tmpbuf), "Register dump [%d]: ", NGREG); for(i = 0; i < NGREG; i++) { -#if __WORDSIZE == 64 - sappend(tmpbuf, sizeof(tmpbuf), "%016llx ", uc->uc_mcontext.gregs[i]); -#else - sappend(tmpbuf, sizeof(tmpbuf), "%08x ", uc->uc_mcontext.gregs[i]); -#endif + sappend(tmpbuf, sizeof(tmpbuf), "%016" PRIx64, uc->uc_mcontext.gregs[i]); } #endif tvhlog_spawn(LOG_ALERT, "CRASH", "%s", tmpbuf);