[Valgrind-developers] valgrind/coregrind

[Nicholas N. <nj...@ca...>]

CVS commit by nethercote: 


64-bit cleanness tweaks.


  M +6 -6      vg_syscalls.c   1.151


--- valgrind/coregrind/vg_syscalls.c  #1.150:1.151
@@ -3346,6 +3346,6 @@ PRE(ioctl)
       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, 
@@ -3364,10 +3364,10 @@ PRE(ioctl)
       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,