From 74cfbeaa0972bc7d1b1026bb1dfa7f6984084174 Mon Sep 17 00:00:00 2001 Message-Id: <74cfbeaa0972bc7d1b1026bb1dfa7f6984084174.1717180704.git.mdw@distorted.org.uk> From: Mark Wooding Date: Tue, 30 Dec 2008 12:16:15 +0000 Subject: [PATCH] Fix format string pedantry to build on 64-bit Linux Organization: Straylight/Edgeware From: Richard Kettlewell --- CHANGES.html | 2 ++ server/speaker-network.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGES.html b/CHANGES.html index 62c908b..98149aa 100644 --- a/CHANGES.html +++ b/CHANGES.html @@ -105,6 +105,8 @@ span.command {

The build system will now automatically cope with Fink's broken GTK+ packages.

+

DisOrder now builds on 64-bit Linux systems.

+

There are some minor fixes to the test suite.

diff --git a/server/speaker-network.c b/server/speaker-network.c index 409cbea..e8a7190 100644 --- a/server/speaker-network.c +++ b/server/speaker-network.c @@ -202,7 +202,7 @@ static size_t network_play(size_t frames) { /* Find the number of microseconds elapsed since rtp_time=0 */ delta = tvsub_us(now, rtp_time_0); if(delta > UINT64_MAX / 88200) - fatal(0, "rtp_time=%llu now=%ld.%06ld rtp_time_0=%ld.%06ld delta=%llu (%lld)", + fatal(0, "rtp_time=%"PRIu64" now=%ld.%06ld rtp_time_0=%ld.%06ld delta=%"PRIu64" (%"PRId64")", rtp_time, (long)now.tv_sec, (long)now.tv_usec, (long)rtp_time_0.tv_sec, (long)rtp_time_0.tv_usec, @@ -302,7 +302,7 @@ static void network_beforepoll(int *timeoutp) { xgettimeofday(&now, 0); target_us = tvsub_us(now, rtp_time_0); if(target_us > UINT64_MAX / 88200) - fatal(0, "rtp_time=%llu rtp_time_0=%ld.%06ld now=%ld.%06ld target_us=%llu (%lld)\n", + fatal(0, "rtp_time=%"PRIu64" rtp_time_0=%ld.%06ld now=%ld.%06ld target_us=%"PRIu64" (%"PRId64")\n", rtp_time, (long)rtp_time_0.tv_sec, (long)rtp_time_0.tv_usec, (long)now.tv_sec, (long)now.tv_usec, -- [mdw]