Darwin: clean up 3 warnings

diff --git a/coregrind/m_aspacemgr/aspacemgr-linux.c b/coregrind/m_aspacemgr/aspacemgr-linux.c
index b38755106e7cc4626a8ee51dd5c8982f3336f183..d9d1512b5a6df61cfe312e90498c050906f52e3f 100644 (file)
--- a/coregrind/m_aspacemgr/aspacemgr-linux.c
+++ b/coregrind/m_aspacemgr/aspacemgr-linux.c
@@ -3732,7 +3732,7 @@ static Addr Addr__min ( Addr a, Addr b ) { return a < b ? a : b; }
 
 static void add_mapping_callback(Addr addr, SizeT len, UInt prot, 
                                  ULong dev, ULong ino, Off64T offset, 
-                                 const HChar *filename)
+                                 const HChar *filename, Bool ignore_offset)
 {
    // derived from sync_check_mapping_callback()
 

diff --git a/coregrind/m_syswrap/syswrap-darwin.c b/coregrind/m_syswrap/syswrap-darwin.c
index 175ea27b32d2277a79a69c8d98900d9dcbad695c..f24b1c79724ba08fa9285072b10661fd7e0f2b6b 100644 (file)
--- a/coregrind/m_syswrap/syswrap-darwin.c
+++ b/coregrind/m_syswrap/syswrap-darwin.c
@@ -1083,16 +1083,6 @@ Bool ML_(sync_mappings)(const HChar* when, const HChar* where, UWord num)
 #define CALL_PRE(name) PRE_FN(name)(tid, layout, arrghs, status, flags)
 #define CALL_POST(name) POST_FN(name)(tid, arrghs, status)
 
-#if VG_WORDSIZE == 4
-// Combine two 32-bit values into a 64-bit value
-// Always use with low-numbered arg first (e.g. LOHI64(ARG1,ARG2) )
-# if defined(VGA_x86)
-#  define LOHI64(lo,hi)   ( ((ULong)(UInt)(lo)) | (((ULong)(UInt)(hi)) << 32) )
-# else
-#  error unknown architecture
-# endif
-#endif
-
 // Retrieve the current Mach thread
 #define MACH_THREAD ((Addr)VG_(get_ThreadState)(tid)->os_state.lwpid)
 

diff --git a/coregrind/vgdb.c b/coregrind/vgdb.c
index 872c7d2801ab9c6c8d7caf5d2b8637fbf68e0507..e109048b1c1fc0dd72903df31b9c1e5574a55de4 100644 (file)
--- a/coregrind/vgdb.c
+++ b/coregrind/vgdb.c
@@ -95,7 +95,7 @@ char *timestamp_str (Bool produce)
       gettimeofday(&dbgtv, NULL);
       ts_tm = localtime(&dbgtv.tv_sec);
       ptr = out + strftime(out, sizeof(out), "%H:%M:%S", ts_tm);
-      sprintf(ptr, ".%6.6ld ", dbgtv.tv_usec);
+      sprintf(ptr, ".%6.6ld ", (long)dbgtv.tv_usec);
    } else {
       out[0] = 0;
    }