|
From: <sv...@va...> - 2009-01-22 12:25:04
|
Author: sewardj
Date: 2009-01-22 12:24:26 +0000 (Thu, 22 Jan 2009)
New Revision: 9019
Log:
Some minor format string fixes for gcc-3.3.3 (SuSE 9.1). Not sure why
later gccs don't complain about these.
Modified:
trunk/coregrind/m_syswrap/syswrap-generic.c
trunk/coregrind/m_syswrap/syswrap-linux.c
trunk/helgrind/libhb_core.c
Modified: trunk/coregrind/m_syswrap/syswrap-generic.c
===================================================================
--- trunk/coregrind/m_syswrap/syswrap-generic.c 2009-01-22 01:36:51 UTC (rev 9018)
+++ trunk/coregrind/m_syswrap/syswrap-generic.c 2009-01-22 12:24:26 UTC (rev 9019)
@@ -2029,7 +2029,7 @@
#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 //{
Modified: trunk/coregrind/m_syswrap/syswrap-linux.c
===================================================================
--- trunk/coregrind/m_syswrap/syswrap-linux.c 2009-01-22 01:36:51 UTC (rev 9018)
+++ trunk/coregrind/m_syswrap/syswrap-linux.c 2009-01-22 12:24:26 UTC (rev 9019)
@@ -373,7 +373,7 @@
#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
Modified: trunk/helgrind/libhb_core.c
===================================================================
--- trunk/helgrind/libhb_core.c 2009-01-22 01:36:51 UTC (rev 9018)
+++ trunk/helgrind/libhb_core.c 2009-01-22 12:24:26 UTC (rev 9019)
@@ -2307,7 +2307,7 @@
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);
}
}
|