aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2013-01-26 14:21:15 +0100
committerDenys Vlasenko <vda.linux@googlemail.com>2013-01-26 14:21:15 +0100
commit17d4436424400517014da7bc46759985e0ea131b (patch)
treec2001f054bec948ef9f996cbce3632ba9f456837
parentee3bc70cea2064d9243e7a39cd1c90dc66eb5e4a (diff)
downloadbusybox-w32-17d4436424400517014da7bc46759985e0ea131b.tar.gz
busybox-w32-17d4436424400517014da7bc46759985e0ea131b.tar.bz2
busybox-w32-17d4436424400517014da7bc46759985e0ea131b.zip
ps: seconds_since_boot: uint64_t -> ulong
Even if long is 32-bit, 4 billion second uptime isn't likely :) Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--procps/ps.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/procps/ps.c b/procps/ps.c
index 5f7372263..89cadad00 100644
--- a/procps/ps.c
+++ b/procps/ps.c
@@ -141,10 +141,7 @@ struct globals {
141 unsigned terminal_width; 141 unsigned terminal_width;
142#if ENABLE_FEATURE_PS_TIME 142#if ENABLE_FEATURE_PS_TIME
143 unsigned kernel_HZ; 143 unsigned kernel_HZ;
144 /* used to be long long, but 64 bits is enough 144 unsigned long seconds_since_boot;
145 * (long long may become 128 bits in the future):
146 */
147 uint64_t seconds_since_boot;
148#endif 145#endif
149} FIX_ALIASING; 146} FIX_ALIASING;
150#define G (*(struct globals*)&bb_common_bufsiz1) 147#define G (*(struct globals*)&bb_common_bufsiz1)