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

diff --git a/coregrind/m_syswrap/syswrap-generic.c b/coregrind/m_syswrap/syswrap-generic.c
index ee346f1b2b237f70ace35f2a4619da69de3757e6..c759682dd1d4d79f60a83b6505889eb8bf858dd1 100644 (file)
--- 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 d4ca9b210997c94605d03cf5bca069d8cdc83158..d2a4e5dc88f1f98c64ed0405ca5533c745697e59 100644 (file)
--- 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 99ba2962ac54c8e90ba6885138bf2a9eae7d902d..f391c50222edd8e2215c7e108aeeb85561e5aa46 100644 (file)
--- 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);
    }
 }