Avoid conflicts with the 2.6 kernel headers, which define

_IOR rather differently, thereby breaking the BLKGETSIZE64 ioctl. -Erik
2003-11-03 08:59:51 +00:00 · 2003-11-03 08:59:51 +00:00 · f6067beaa9
commit f6067beaa9
parent e6dc439b3a
1 changed files with 5 additions and 0 deletions
--- a/util-linux/fdisk.c
+++ b/util-linux/fdisk.c
@ -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) */

 /*