diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2012-09-25 12:48:10 +0200 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2012-09-25 12:48:10 +0200 |
commit | 42be921d486ee0fb43e982341cd54c41f15f55ee (patch) | |
tree | 255c59bdff8a5ff0f96863bb2456614722b76744 | |
parent | 2fb8d0dee974622c52e446a02d066cccc4768bbf (diff) | |
download | busybox-w32-42be921d486ee0fb43e982341cd54c41f15f55ee.tar.gz busybox-w32-42be921d486ee0fb43e982341cd54c41f15f55ee.tar.bz2 busybox-w32-42be921d486ee0fb43e982341cd54c41f15f55ee.zip |
ps: fix build failure in !DESKTOP case
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r-- | procps/ps.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/procps/ps.c b/procps/ps.c index 3a5af7c18..efc087ee5 100644 --- a/procps/ps.c +++ b/procps/ps.c | |||
@@ -655,9 +655,9 @@ int ps_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM) | |||
655 | time_t now = now; | 655 | time_t now = now; |
656 | long uptime; | 656 | long uptime; |
657 | #endif | 657 | #endif |
658 | int opts = 0; | ||
659 | /* If we support any options, parse argv */ | 658 | /* If we support any options, parse argv */ |
660 | #if ENABLE_SELINUX || ENABLE_FEATURE_SHOW_THREADS || ENABLE_FEATURE_PS_WIDE || ENABLE_FEATURE_PS_LONG | 659 | #if ENABLE_SELINUX || ENABLE_FEATURE_SHOW_THREADS || ENABLE_FEATURE_PS_WIDE || ENABLE_FEATURE_PS_LONG |
660 | int opts = 0; | ||
661 | # if ENABLE_FEATURE_PS_WIDE | 661 | # if ENABLE_FEATURE_PS_WIDE |
662 | /* -w is a bit complicated */ | 662 | /* -w is a bit complicated */ |
663 | int w_count = 0; | 663 | int w_count = 0; |
@@ -711,10 +711,10 @@ int ps_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM) | |||
711 | * We also show STIME (standard says that -f shows it, -l doesn't). | 711 | * We also show STIME (standard says that -f shows it, -l doesn't). |
712 | */ | 712 | */ |
713 | puts("S UID PID PPID VSZ RSS TTY STIME TIME CMD"); | 713 | puts("S UID PID PPID VSZ RSS TTY STIME TIME CMD"); |
714 | #if ENABLE_FEATURE_PS_LONG | 714 | # if ENABLE_FEATURE_PS_LONG |
715 | now = time(NULL); | 715 | now = time(NULL); |
716 | uptime = get_uptime(); | 716 | uptime = get_uptime(); |
717 | #endif | 717 | # endif |
718 | } | 718 | } |
719 | else { | 719 | else { |
720 | puts(" PID USER VSZ STAT COMMAND"); | 720 | puts(" PID USER VSZ STAT COMMAND"); |