aboutsummaryrefslogtreecommitdiff
path: root/util-linux/fdisk.c
diff options
context:
space:
mode:
authorandersen <andersen@69ca8d6d-28ef-0310-b511-8ec308f3f277>2003-11-03 08:59:51 +0000
committerandersen <andersen@69ca8d6d-28ef-0310-b511-8ec308f3f277>2003-11-03 08:59:51 +0000
commit4ccd83db3f12b4b4137a5d5e9cae9f9ddcd8a1ca (patch)
treead787350e1d7ac1bb56d3d374ff9808596d22a90 /util-linux/fdisk.c
parentf9ece60e489d3250dac2887a0f0b6ba62b8a158c (diff)
downloadbusybox-w32-4ccd83db3f12b4b4137a5d5e9cae9f9ddcd8a1ca.tar.gz
busybox-w32-4ccd83db3f12b4b4137a5d5e9cae9f9ddcd8a1ca.tar.bz2
busybox-w32-4ccd83db3f12b4b4137a5d5e9cae9f9ddcd8a1ca.zip
Avoid conflicts with the 2.6 kernel headers, which define
_IOR rather differently, thereby breaking the BLKGETSIZE64 ioctl. -Erik git-svn-id: svn://busybox.net/trunk/busybox@7756 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to '')
-rw-r--r--util-linux/fdisk.c5
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/*