1 diff -Naur util-linux-2.12/disk-utils/blockdev.c util-linux-2.12-ok/disk-utils/blockdev.c
2 --- util-linux-2.12/disk-utils/blockdev.c 2002-03-08 23:57:02.000000000 +0100
3 +++ util-linux-2.12-ok/disk-utils/blockdev.c 2004-11-09 14:21:13.000000000 +0100
5 #define BLKRASET _IO(0x12,98)
6 #define BLKRAGET _IO(0x12,99)
7 #define BLKSSZGET _IO(0x12,104)
8 -#define BLKBSZGET _IOR(0x12,112,sizeof(int))
9 -#define BLKBSZSET _IOW(0x12,113,sizeof(int))
10 +#define BLKBSZGET _IOR(0x12,112,int)
11 +#define BLKBSZSET _IOW(0x12,113,int)
14 /* Maybe <linux/hdreg.h> could be included */
15 diff -Naur util-linux-2.12/disk-utils/elvtune.c util-linux-2.12-ok/disk-utils/elvtune.c
16 --- util-linux-2.12/disk-utils/elvtune.c 2002-03-08 23:57:49.000000000 +0100
17 +++ util-linux-2.12-ok/disk-utils/elvtune.c 2004-11-09 14:21:44.000000000 +0100
19 int max_bomb_segments;
22 -#define BLKELVGET _IOR(0x12,106,sizeof(blkelv_ioctl_arg_t))
23 -#define BLKELVSET _IOW(0x12,107,sizeof(blkelv_ioctl_arg_t))
24 +#define BLKELVGET _IOR(0x12,106,blkelv_ioctl_arg_t)
25 +#define BLKELVSET _IOW(0x12,107,blkelv_ioctl_arg_t)
29 diff -Naur util-linux-2.12/fdisk/common.h util-linux-2.12-ok/fdisk/common.h
30 --- util-linux-2.12/fdisk/common.h 2003-07-13 15:59:53.000000000 +0200
31 +++ util-linux-2.12-ok/fdisk/common.h 2004-11-09 14:37:41.000000000 +0100
33 #define BLKGETSIZE _IO(0x12,96) /* return device size */
34 #define BLKFLSBUF _IO(0x12,97) /* flush buffer cache */
35 #define BLKSSZGET _IO(0x12,104) /* get block device sector size */
36 -#define BLKGETSIZE64 _IOR(0x12,114,8) /* 8 = sizeof(u64) */
37 +#define BLKGETSIZE64 _IOR(0x12,114,unsigned long long)/* 8 = sizeof(u64) */
39 /* including <linux/hdreg.h> also fails */
41 diff -Naur util-linux-2.12/partx/gpt.c util-linux-2.12-ok/partx/gpt.c
42 --- util-linux-2.12/partx/gpt.c 2002-08-04 02:20:16.000000000 +0200
43 +++ util-linux-2.12-ok/partx/gpt.c 2004-11-09 14:23:18.000000000 +0100
45 #define BLKGETLASTSECT _IO(0x12,108) /* get last sector of block device */
46 #define BLKGETSIZE _IO(0x12,96) /* return device size */
47 #define BLKSSZGET _IO(0x12,104) /* get block device sector size */
48 -#define BLKGETSIZE64 _IOR(0x12,114,sizeof(uint64_t)) /* return device size in bytes (u64 *arg) */
49 +#define BLKGETSIZE64 _IOR(0x12,114,uint64_t) /* return device size in bytes (u64 *arg) */
51 struct blkdev_ioctl_param {