diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2009-09-21 23:58:43 +0200 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2009-09-21 23:58:43 +0200 |
commit | d75295c80bcfa577b124328f09e75ea15facf67f (patch) | |
tree | 91997d8bc037ae494576a9366906caf0555663cb /procps/top.c | |
parent | 69b1cef921ac66e8f792ff52ddb3a5609600a17f (diff) | |
download | busybox-w32-d75295c80bcfa577b124328f09e75ea15facf67f.tar.gz busybox-w32-d75295c80bcfa577b124328f09e75ea15facf67f.tar.bz2 busybox-w32-d75295c80bcfa577b124328f09e75ea15facf67f.zip |
ps: conditionally enable -T on non-DESKTOP build too
function old new delta
ps_main 253 274 +21
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'procps/top.c')
-rw-r--r-- | procps/top.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/procps/top.c b/procps/top.c index dbaaca14f..9e8ad1d1f 100644 --- a/procps/top.c +++ b/procps/top.c | |||
@@ -895,7 +895,7 @@ int top_main(int argc UNUSED_PARAM, char **argv) | |||
895 | int lines_rem; | 895 | int lines_rem; |
896 | unsigned interval; | 896 | unsigned interval; |
897 | char *str_interval, *str_iterations; | 897 | char *str_interval, *str_iterations; |
898 | IF_NOT_FEATURE_TOPMEM(const) unsigned scan_mask = TOP_MASK; | 898 | unsigned scan_mask = TOP_MASK; |
899 | #if ENABLE_FEATURE_USE_TERMIOS | 899 | #if ENABLE_FEATURE_USE_TERMIOS |
900 | struct termios new_settings; | 900 | struct termios new_settings; |
901 | struct pollfd pfd[1]; | 901 | struct pollfd pfd[1]; |
@@ -1080,13 +1080,13 @@ int top_main(int argc UNUSED_PARAM, char **argv) | |||
1080 | sort_function[2] = time_sort; | 1080 | sort_function[2] = time_sort; |
1081 | # endif | 1081 | # endif |
1082 | } | 1082 | } |
1083 | #if ENABLE_FEATURE_SHOW_THREADS | 1083 | # if ENABLE_FEATURE_SHOW_THREADS |
1084 | if (c == 'h' | 1084 | if (c == 'h' |
1085 | IF_FEATURE_TOPMEM(&& scan_mask != TOPMEM_MASK) | 1085 | IF_FEATURE_TOPMEM(&& scan_mask != TOPMEM_MASK) |
1086 | ) { | 1086 | ) { |
1087 | scan_mask ^= PSSCAN_TASKS; | 1087 | scan_mask ^= PSSCAN_TASKS; |
1088 | } | 1088 | } |
1089 | #endif | 1089 | # endif |
1090 | # if ENABLE_FEATURE_TOP_CPU_USAGE_PERCENTAGE | 1090 | # if ENABLE_FEATURE_TOP_CPU_USAGE_PERCENTAGE |
1091 | if (c == 'p') { | 1091 | if (c == 'p') { |
1092 | IF_FEATURE_TOPMEM(scan_mask = TOP_MASK;) | 1092 | IF_FEATURE_TOPMEM(scan_mask = TOP_MASK;) |