summaryrefslogtreecommitdiff
path: root/miscutils
diff options
context:
space:
mode:
authorEric Andersen2004-07-20 22:53:59 +0000
committerEric Andersen2004-07-20 22:53:59 +0000
commitf828da00201ad4c245f22fd5466be1ddb63b0f74 (patch)
treecdab0378be5a20782711d796a071819254374660 /miscutils
parentbd8dd1e76382eaa6b46f921b7bb6db085f55289a (diff)
downloadbusybox-f828da00201ad4c245f22fd5466be1ddb63b0f74.zip
busybox-f828da00201ad4c245f22fd5466be1ddb63b0f74.tar.gz
Avoid a naming conflict with include/bits/fcntl.h
Diffstat (limited to 'miscutils')
-rw-r--r--miscutils/hdparm.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/miscutils/hdparm.c b/miscutils/hdparm.c
index bbb707c..0d2c328 100644
--- a/miscutils/hdparm.c
+++ b/miscutils/hdparm.c
@@ -1226,7 +1226,7 @@ static int verbose = 0, get_identity = 0, get_geom = 0, noisy = 1, quiet = 0;
static int flagcount = 0, do_flush = 0, is_scsi_hd = 0, is_xt_hd = 0;
static int do_ctimings, do_timings = 0;
-static unsigned long set_readahead= 0, get_readahead= 0, readahead= 0;
+static unsigned long set_readahead= 0, get_readahead= 0, Xreadahead= 0;
static unsigned long set_readonly = 0, get_readonly = 0, readonly = 0;
static unsigned long set_unmask = 0, get_unmask = 0, unmask = 0;
static unsigned long set_mult = 0, get_mult = 0, mult = 0;
@@ -1936,8 +1936,8 @@ static void process_dev (char *devname)
if (set_readahead)
{
- if_printf(get_readahead," setting fs readahead to %ld\n", readahead);
- bb_ioctl(fd, BLKRASET,(int *)readahead,"BLKRASET");
+ if_printf(get_readahead," setting fs readahead to %ld\n", Xreadahead);
+ bb_ioctl(fd, BLKRASET,(int *)Xreadahead,"BLKRASET");
}
#ifdef CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF
if (unregister_hwif)
@@ -2829,7 +2829,7 @@ expected_hwif_error:
noisy = 1;
if (!*p && argc && isalnum(**argv))
p = *argv++, --argc;
- p=GET_NUMBER(p,&set_readahead,&readahead);
+ p=GET_NUMBER(p,&set_readahead,&Xreadahead);
break;
case 'B':
get_apmmode = noisy;