From f3523a4a0e94b0061f776cc3d539afdcba6c27cc Mon Sep 17 00:00:00 2001 From: Julian Seward Date: Thu, 22 Jan 2009 12:24:26 +0000 Subject: [PATCH] Some minor format string fixes for gcc-3.3.3 (SuSE 9.1). Not sure why later gccs don't complain about these. git-svn-id: svn://svn.valgrind.org/valgrind/trunk@9019 --- coregrind/m_syswrap/syswrap-generic.c | 2 +- coregrind/m_syswrap/syswrap-linux.c | 2 +- helgrind/libhb_core.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/coregrind/m_syswrap/syswrap-generic.c b/coregrind/m_syswrap/syswrap-generic.c index ee346f1b2b..c759682dd1 100644 --- a/coregrind/m_syswrap/syswrap-generic.c +++ b/coregrind/m_syswrap/syswrap-generic.c @@ -2029,7 +2029,7 @@ ML_(generic_PRE_sys_mmap) ( ThreadId tid, #define POST(name) DEFN_POST_TEMPLATE(generic, name) // Combine two 32-bit values into a 64-bit value -#define LOHI64(lo,hi) ( (lo) | ((ULong)(hi) << 32) ) +#define LOHI64(lo,hi) ( ((ULong)(lo)) | (((ULong)(hi)) << 32) ) //zz //PRE(sys_exit_group, Special) //zz //{ diff --git a/coregrind/m_syswrap/syswrap-linux.c b/coregrind/m_syswrap/syswrap-linux.c index d4ca9b2109..d2a4e5dc88 100644 --- a/coregrind/m_syswrap/syswrap-linux.c +++ b/coregrind/m_syswrap/syswrap-linux.c @@ -373,7 +373,7 @@ SysRes ML_(do_fork_clone) ( ThreadId tid, UInt flags, #define POST(name) DEFN_POST_TEMPLATE(linux, name) // Combine two 32-bit values into a 64-bit value -#define LOHI64(lo,hi) ( (lo) | ((ULong)(hi) << 32) ) +#define LOHI64(lo,hi) ( ((ULong)(lo)) | (((ULong)(hi)) << 32) ) /* --------------------------------------------------------------------- *mount wrappers diff --git a/helgrind/libhb_core.c b/helgrind/libhb_core.c index 99ba2962ac..f391c50222 100644 --- a/helgrind/libhb_core.c +++ b/helgrind/libhb_core.c @@ -2307,7 +2307,7 @@ static void vts_tab__do_GC ( Bool show_stats ) tl_assert(nTab > 0); VG_(message)(Vg_DebugMsg, "libhb: VTS GC: #%u old size %lu live %lu (%2llu%%)", - ctr++, nTab, nLive, (100ULL * nLive) / nTab); + ctr++, nTab, nLive, (100ULL * (ULong)nLive) / (ULong)nTab); } } -- 2.47.3