diff options
author | Eric Andersen <andersen@codepoet.org> | 2004-07-20 22:53:59 +0000 |
---|---|---|
committer | Eric Andersen <andersen@codepoet.org> | 2004-07-20 22:53:59 +0000 |
commit | f828da00201ad4c245f22fd5466be1ddb63b0f74 (patch) | |
tree | cdab0378be5a20782711d796a071819254374660 | |
parent | bd8dd1e76382eaa6b46f921b7bb6db085f55289a (diff) | |
download | busybox-w32-f828da00201ad4c245f22fd5466be1ddb63b0f74.tar.gz busybox-w32-f828da00201ad4c245f22fd5466be1ddb63b0f74.tar.bz2 busybox-w32-f828da00201ad4c245f22fd5466be1ddb63b0f74.zip |
Avoid a naming conflict with include/bits/fcntl.h
-rw-r--r-- | miscutils/hdparm.c | 8 |
1 files changed, 4 insertions, 4 deletions
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; | |||
1226 | static int flagcount = 0, do_flush = 0, is_scsi_hd = 0, is_xt_hd = 0; | 1226 | static int flagcount = 0, do_flush = 0, is_scsi_hd = 0, is_xt_hd = 0; |
1227 | static int do_ctimings, do_timings = 0; | 1227 | static int do_ctimings, do_timings = 0; |
1228 | 1228 | ||
1229 | static unsigned long set_readahead= 0, get_readahead= 0, readahead= 0; | 1229 | static unsigned long set_readahead= 0, get_readahead= 0, Xreadahead= 0; |
1230 | static unsigned long set_readonly = 0, get_readonly = 0, readonly = 0; | 1230 | static unsigned long set_readonly = 0, get_readonly = 0, readonly = 0; |
1231 | static unsigned long set_unmask = 0, get_unmask = 0, unmask = 0; | 1231 | static unsigned long set_unmask = 0, get_unmask = 0, unmask = 0; |
1232 | static unsigned long set_mult = 0, get_mult = 0, mult = 0; | 1232 | static unsigned long set_mult = 0, get_mult = 0, mult = 0; |
@@ -1936,8 +1936,8 @@ static void process_dev (char *devname) | |||
1936 | 1936 | ||
1937 | if (set_readahead) | 1937 | if (set_readahead) |
1938 | { | 1938 | { |
1939 | if_printf(get_readahead," setting fs readahead to %ld\n", readahead); | 1939 | if_printf(get_readahead," setting fs readahead to %ld\n", Xreadahead); |
1940 | bb_ioctl(fd, BLKRASET,(int *)readahead,"BLKRASET"); | 1940 | bb_ioctl(fd, BLKRASET,(int *)Xreadahead,"BLKRASET"); |
1941 | } | 1941 | } |
1942 | #ifdef CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF | 1942 | #ifdef CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF |
1943 | if (unregister_hwif) | 1943 | if (unregister_hwif) |
@@ -2829,7 +2829,7 @@ expected_hwif_error: | |||
2829 | noisy = 1; | 2829 | noisy = 1; |
2830 | if (!*p && argc && isalnum(**argv)) | 2830 | if (!*p && argc && isalnum(**argv)) |
2831 | p = *argv++, --argc; | 2831 | p = *argv++, --argc; |
2832 | p=GET_NUMBER(p,&set_readahead,&readahead); | 2832 | p=GET_NUMBER(p,&set_readahead,&Xreadahead); |
2833 | break; | 2833 | break; |
2834 | case 'B': | 2834 | case 'B': |
2835 | get_apmmode = noisy; | 2835 | get_apmmode = noisy; |