summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2012-09-25 10:48:10 (GMT)
committer Denys Vlasenko <vda.linux@googlemail.com>2012-09-25 10:48:10 (GMT)
commit42be921d486ee0fb43e982341cd54c41f15f55ee (patch)
tree255c59bdff8a5ff0f96863bb2456614722b76744
parent2fb8d0dee974622c52e446a02d066cccc4768bbf (diff)
downloadbusybox-42be921d486ee0fb43e982341cd54c41f15f55ee.tar.gz
busybox-42be921d486ee0fb43e982341cd54c41f15f55ee.tar.bz2
ps: fix build failure in !DESKTOP case
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--procps/ps.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/procps/ps.c b/procps/ps.c
index 3a5af7c..efc087e 100644
--- a/procps/ps.c
+++ b/procps/ps.c
@@ -655,9 +655,9 @@ int ps_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
time_t now = now;
long uptime;
#endif
- int opts = 0;
/* If we support any options, parse argv */
#if ENABLE_SELINUX || ENABLE_FEATURE_SHOW_THREADS || ENABLE_FEATURE_PS_WIDE || ENABLE_FEATURE_PS_LONG
+ int opts = 0;
# if ENABLE_FEATURE_PS_WIDE
/* -w is a bit complicated */
int w_count = 0;
@@ -711,10 +711,10 @@ int ps_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
* We also show STIME (standard says that -f shows it, -l doesn't).
*/
puts("S UID PID PPID VSZ RSS TTY STIME TIME CMD");
-#if ENABLE_FEATURE_PS_LONG
+# if ENABLE_FEATURE_PS_LONG
now = time(NULL);
uptime = get_uptime();
-#endif
+# endif
}
else {
puts(" PID USER VSZ STAT COMMAND");