We can print native word sized values sensibly now...
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@4915 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/memcheck/mac_malloc_wrappers.c b/memcheck/mac_malloc_wrappers.c
index 875c062..0320024 100644
--- a/memcheck/mac_malloc_wrappers.c
+++ b/memcheck/mac_malloc_wrappers.c
@@ -158,15 +158,8 @@
// assuming here that the size asked for is not greater than 2^31 bytes
// (for 32-bit platforms) or 2^63 bytes (for 64-bit platforms).
if ((SSizeT)sizeB < 0) {
-#if VG_WORDSIZE == 4
- VG_(message)(Vg_UserMsg, "Warning: silly arg (%d) to %s()",
- (Int)sizeB, fn );
-#elif VG_WORDSIZE == 8
- VG_(message)(Vg_UserMsg, "Warning: silly arg (%lld) to %s()",
- (Long)sizeB, fn );
-#else
-# error Unexpected word size
-#endif
+ VG_(message)(Vg_UserMsg, "Warning: silly arg (%ld) to %s()",
+ (SSizeT)sizeB, fn );
return True;
}
return False;
@@ -175,15 +168,8 @@
static Bool complain_about_silly_args2(SizeT n, SizeT sizeB)
{
if ((SSizeT)n < 0 || (SSizeT)sizeB < 0) {
-#if VG_WORDSIZE == 4
- VG_(message)(Vg_UserMsg, "Warning: silly args (%d,%d) to calloc()",
- (Int)n, (Int)sizeB);
-#elif VG_WORDSIZE == 8
- VG_(message)(Vg_UserMsg, "Warning: silly args (%lld,%lld) to calloc()",
- (Long)n, (Long)sizeB);
-#else
-# error Unexpected word size
-#endif
+ VG_(message)(Vg_UserMsg, "Warning: silly args (%ld,%ld) to calloc()",
+ (SSizeT)n, (SSizeT)sizeB);
return True;
}
return False;