[git commit master] hdparm, fdisk: reinstate BLKGETSIZE64 #defines. No code changes

Denys Vlasenko vda.linux at googlemail.com
Tue Sep 22 21:16:39 UTC 2009


commit: http://git.busybox.net/busybox/commit/?id=af3fd14e4df87d8af833d5e7b97d285b4d137d60
branch: http://git.busybox.net/busybox/commit/?id=refs/heads/master

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 miscutils/hdparm.c |    3 +++
 util-linux/fdisk.c |    5 ++++-
 2 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/miscutils/hdparm.c b/miscutils/hdparm.c
index 6068223..0917b41 100644
--- a/miscutils/hdparm.c
+++ b/miscutils/hdparm.c
@@ -15,6 +15,9 @@
 /* must be _after_ libbb.h: */
 #include <linux/hdreg.h>
 #include <sys/mount.h>
+#if !defined(BLKGETSIZE64)
+# define BLKGETSIZE64 _IOR(0x12,114,size_t)
+#endif
 
 /* device types */
 /* ------------ */
diff --git a/util-linux/fdisk.c b/util-linux/fdisk.c
index e50ee77..1bb3a9d 100644
--- a/util-linux/fdisk.c
+++ b/util-linux/fdisk.c
@@ -9,13 +9,16 @@
 
 #ifndef _LARGEFILE64_SOURCE
 /* For lseek64 */
-#define _LARGEFILE64_SOURCE
+# define _LARGEFILE64_SOURCE
 #endif
 #include <assert.h>             /* assert */
 #include <sys/mount.h>
 #if !defined(BLKSSZGET)
 # define BLKSSZGET _IO(0x12, 104)
 #endif
+#if !defined(BLKGETSIZE64)
+# define BLKGETSIZE64 _IOR(0x12,114,size_t)
+#endif
 #include "libbb.h"
 
 /* Looks like someone forgot to add this to config system */
-- 
1.6.3.3



More information about the busybox-cvs mailing list