[BusyBox-cvs] busybox/util-linux fdisk.c,1.10,1.11

[Erik Andersen]

Update of /var/cvs/busybox/util-linux
In directory winder:/tmp/cvs-serv2330/util-linux

Modified Files:
	fdisk.c 
Log Message:
Avoid conflicts with the 2.6 kernel headers, which define
_IOR rather differently, thereby breaking the BLKGETSIZE64
ioctl.
 -Erik


Index: fdisk.c
===================================================================
RCS file: /var/cvs/busybox/util-linux/fdisk.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- fdisk.c	8 Aug 2003 20:04:56 -0000	1.10
+++ fdisk.c	3 Nov 2003 08:59:51 -0000	1.11
@@ -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) */
 
 /*