From: Nicholas Nethercote <n.nethercote@gmail.com>
Date: Mon, 1 Nov 2004 15:19:46 +0000 (+0000)
Subject: 64-bit cleanness tweaks.
X-Git-Tag: svn/VALGRIND_3_0_0~1416
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e78cfe5b199098197f61b1f3bb6fe8ceabe809de;p=thirdparty%2Fvalgrind.git

64-bit cleanness tweaks.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@2890
---

diff --git a/coregrind/vg_syscalls.c b/coregrind/vg_syscalls.c
index 81151d3e65..3f634da192 100644
--- a/coregrind/vg_syscalls.c
+++ b/coregrind/vg_syscalls.c
@@ -3345,8 +3345,8 @@ PRE(ioctl)
    case VKI_CDROMSUBCHNL:
       SYSCALL_TRACK( pre_mem_read,tid, 
 		     "ioctl(CDROMSUBCHNL (cdsc_format, char))",
-		     (int) &(((struct vki_cdrom_subchnl *) arg3)->cdsc_format), 
-		     sizeof(((struct vki_cdrom_subchnl *) arg3)->cdsc_format));
+		     (Addr) &(((struct vki_cdrom_subchnl*) arg3)->cdsc_format),
+		     sizeof(((struct vki_cdrom_subchnl*) arg3)->cdsc_format));
       SYSCALL_TRACK( pre_mem_write,tid, 
 		     "ioctl(CDROMSUBCHNL)", arg3, 
 		     sizeof(struct vki_cdrom_subchnl));
@@ -3363,12 +3363,12 @@ PRE(ioctl)
    case VKI_CDROMREADTOCENTRY:
       SYSCALL_TRACK( pre_mem_read,tid, 
 		     "ioctl(CDROMREADTOCENTRY (cdte_format, char))",
-		     (int) &(((struct vki_cdrom_tocentry *) arg3)->cdte_format), 
-		     sizeof(((struct vki_cdrom_tocentry *) arg3)->cdte_format));
+		     (Addr) &(((struct vki_cdrom_tocentry*) arg3)->cdte_format),
+		     sizeof(((struct vki_cdrom_tocentry*) arg3)->cdte_format));
       SYSCALL_TRACK( pre_mem_read,tid, 
 		     "ioctl(CDROMREADTOCENTRY (cdte_track, char))",
-		     (int) &(((struct vki_cdrom_tocentry *) arg3)->cdte_track), 
-		     sizeof(((struct vki_cdrom_tocentry *) arg3)->cdte_track));
+		     (Addr) &(((struct vki_cdrom_tocentry*) arg3)->cdte_track), 
+		     sizeof(((struct vki_cdrom_tocentry*) arg3)->cdte_track));
       SYSCALL_TRACK( pre_mem_write,tid, 
 		     "ioctl(CDROMREADTOCENTRY)", arg3, 
 		     sizeof(struct vki_cdrom_tocentry));