diff options
| author | Eric Andersen <andersen@codepoet.org> | 2003-11-03 08:59:51 +0000 |
|---|---|---|
| committer | Eric Andersen <andersen@codepoet.org> | 2003-11-03 08:59:51 +0000 |
| commit | f6067beaa9408730c4232620330453e756d6d4f9 (patch) | |
| tree | ad787350e1d7ac1bb56d3d374ff9808596d22a90 | |
| parent | e6dc439b3a3fa2a64f9e938ac4e5810025c04242 (diff) | |
| download | busybox-w32-f6067beaa9408730c4232620330453e756d6d4f9.tar.gz busybox-w32-f6067beaa9408730c4232620330453e756d6d4f9.tar.bz2 busybox-w32-f6067beaa9408730c4232620330453e756d6d4f9.zip | |
Avoid conflicts with the 2.6 kernel headers, which define
_IOR rather differently, thereby breaking the BLKGETSIZE64
ioctl.
-Erik
| -rw-r--r-- | util-linux/fdisk.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/util-linux/fdisk.c b/util-linux/fdisk.c index 02c5c10ff..6c28e02ec 100644 --- a/util-linux/fdisk.c +++ b/util-linux/fdisk.c | |||
| @@ -55,6 +55,11 @@ | |||
| 55 | #define BLKGETSIZE _IO(0x12,96) /* return device size */ | 55 | #define BLKGETSIZE _IO(0x12,96) /* return device size */ |
| 56 | #define BLKFLSBUF _IO(0x12,97) /* flush buffer cache */ | 56 | #define BLKFLSBUF _IO(0x12,97) /* flush buffer cache */ |
| 57 | #define BLKSSZGET _IO(0x12,104) /* get block device sector size */ | 57 | #define BLKSSZGET _IO(0x12,104) /* get block device sector size */ |
| 58 | |||
| 59 | /* Avoid conflicts with the 2.6 kernel headers, which define | ||
| 60 | * _IOR rather differently */ | ||
| 61 | #undef _IOR | ||
| 62 | #define _IOR(type,nr,size) _IOC(_IOC_READ,(type),(nr),sizeof(size)) | ||
| 58 | #define BLKGETSIZE64 _IOR(0x12,114,8) /* 8 = sizeof(u64) */ | 63 | #define BLKGETSIZE64 _IOR(0x12,114,8) /* 8 = sizeof(u64) */ |
| 59 | 64 | ||
| 60 | /* | 65 | /* |