summaryrefslogtreecommitdiff
path: root/miscutils
diff options
context:
space:
mode:
authorEric Andersen2004-02-14 21:33:39 +0000
committerEric Andersen2004-02-14 21:33:39 +0000
commit7e8f41cb5b0da04a3ff14f262ddf1b1016d475cf (patch)
tree0e42fd31a9f410bfd7af2d9613afa8046a56060e /miscutils
parentec359e9ebbd1e55e4e3074512f8a5b191c3465a3 (diff)
downloadbusybox-7e8f41cb5b0da04a3ff14f262ddf1b1016d475cf.zip
busybox-7e8f41cb5b0da04a3ff14f262ddf1b1016d475cf.tar.gz
Avoid naming conflict with symbol in newer glibc headers
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 16ab7e6..5c91b52 100644
--- a/miscutils/hdparm.c
+++ b/miscutils/hdparm.c
@@ -1238,7 +1238,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, bbreadahead= 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;
@@ -1948,8 +1948,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", bbreadahead);
+ bb_ioctl(fd, BLKRASET,(int *)bbreadahead,"BLKRASET");
}
#ifdef CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF
if (unregister_hwif)
@@ -2839,7 +2839,7 @@ error:
while (isdigit(*p))
{
set_readahead = 1;
- readahead = (readahead * 10) + (*p++ - '0');
+ bbreadahead = (bbreadahead * 10) + (*p++ - '0');
}
break;
case 'B':