aboutsummaryrefslogtreecommitdiff
path: root/procps/ps.c
diff options
context:
space:
mode:
authorRon Yorston <rmy@pobox.com>2016-05-16 09:33:03 +0100
committerRon Yorston <rmy@pobox.com>2016-05-16 09:33:03 +0100
commit35d2f5bccb0f3dde600702ebcdb5424d4d50be4a (patch)
tree6e0ff0341c69839e268459a199682628bae734ed /procps/ps.c
parent248a2600a2f4b442101ad568d1994b908bb28d4b (diff)
parentf2559e5c2b7bd2c5fa0dd8e88d0a931da92a23af (diff)
downloadbusybox-w32-35d2f5bccb0f3dde600702ebcdb5424d4d50be4a.tar.gz
busybox-w32-35d2f5bccb0f3dde600702ebcdb5424d4d50be4a.tar.bz2
busybox-w32-35d2f5bccb0f3dde600702ebcdb5424d4d50be4a.zip
Merge branch 'busybox' into merge
Diffstat (limited to 'procps/ps.c')
-rw-r--r--procps/ps.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/procps/ps.c b/procps/ps.c
index 8c373376d..39cccec82 100644
--- a/procps/ps.c
+++ b/procps/ps.c
@@ -62,6 +62,7 @@
62//usage: " 2990 andersen andersen R ps\n" 62//usage: " 2990 andersen andersen R ps\n"
63 63
64#include "libbb.h" 64#include "libbb.h"
65#include "common_bufsiz.h"
65#ifdef __linux__ 66#ifdef __linux__
66# include <sys/sysinfo.h> 67# include <sys/sysinfo.h>
67#endif 68#endif
@@ -144,7 +145,7 @@ struct globals {
144 unsigned long seconds_since_boot; 145 unsigned long seconds_since_boot;
145#endif 146#endif
146} FIX_ALIASING; 147} FIX_ALIASING;
147#define G (*(struct globals*)&bb_common_bufsiz1) 148#define G (*(struct globals*)bb_common_bufsiz1)
148#define out (G.out ) 149#define out (G.out )
149#define out_cnt (G.out_cnt ) 150#define out_cnt (G.out_cnt )
150#define print_header (G.print_header ) 151#define print_header (G.print_header )
@@ -152,7 +153,7 @@ struct globals {
152#define buffer (G.buffer ) 153#define buffer (G.buffer )
153#define terminal_width (G.terminal_width ) 154#define terminal_width (G.terminal_width )
154#define kernel_HZ (G.kernel_HZ ) 155#define kernel_HZ (G.kernel_HZ )
155#define INIT_G() do { } while (0) 156#define INIT_G() do { setup_common_bufsiz(); } while (0)
156 157
157#if ENABLE_FEATURE_PS_TIME 158#if ENABLE_FEATURE_PS_TIME
158/* for ELF executables, notes are pushed before environment and args */ 159/* for ELF executables, notes are pushed before environment and args */