[BusyBox-cvs] CVS update of busybox/miscutils (hdparm.c)

[Erik Andersen]

    Date: Tuesday, July 20, 2004 @ 16:54:00
  Author: andersen
    Path: /var/cvs/busybox/miscutils

Modified: hdparm.c (1.15 -> 1.16)

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


Index: busybox/miscutils/hdparm.c
diff -u busybox/miscutils/hdparm.c:1.15 busybox/miscutils/hdparm.c:1.16
--- busybox/miscutils/hdparm.c:1.15	Wed Apr 14 11:51:21 2004
+++ busybox/miscutils/hdparm.c	Tue Jul 20 16:53:59 2004
@@ -1226,7 +1226,7 @@
 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 @@
 
 	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 @@
 						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;