f6067beaa
Eric Andersen
2003-11-03
Subject
Avoid conflicts with the 2.6 kernel headers, which define _IOR rather differently, thereby breaking the BLKGETSIZE64 ioctl. -Erik
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
util-linux/fdisk.c+5 -0
| @@ -55,6 +55,11 @@ | |
| #define BLKGETSIZE _IO(0x12,96) /* return device size */ | |
| #define BLKFLSBUF _IO(0x12,97) /* flush buffer cache */ | |
| #define BLKSSZGET _IO(0x12,104) /* get block device sector size */ | |
| + | |
| + | /* Avoid conflicts with the 2.6 kernel headers, which define |
| + | * _IOR rather differently */ |
| + | #undef _IOR |
| + | #define _IOR(type,nr,size) _IOC(_IOC_READ,(type),(nr),sizeof(size)) |
| #define BLKGETSIZE64 _IOR(0x12,114,8) /* 8 = sizeof(u64) */ | |
| /* | |