From: Eric Andersen <andersen@codepoet.org>
Date: Tue, 20 Jul 2004 22:53:59 +0000 (-0000)
Subject: Avoid a naming conflict with include/bits/fcntl.h
X-Git-Tag: 1_00_rc2~34
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f828da00201ad4c245f22fd5466be1ddb63b0f74;p=oweals%2Fbusybox.git

Avoid a naming conflict with include/bits/fcntl.h
---

diff --git a/miscutils/hdparm.c b/miscutils/hdparm.c
index bbb707cf7..0d2c328f0 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;