diff options
| author | Ron Yorston <rmy@pobox.com> | 2012-03-22 15:48:57 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2012-03-22 15:48:57 +0000 |
| commit | 9db164d6e39050d09f38288c6045cd2a2cbf6d63 (patch) | |
| tree | ea5dc2d28d15da0de25c197ed7d059c3656af1a0 /procps/ps.c | |
| parent | 1118c95535ea51961437089fc3dece5ab4ea7e1b (diff) | |
| parent | d84b175cb6948eb17f847313bf912174e2f934e1 (diff) | |
| download | busybox-w32-9db164d6e39050d09f38288c6045cd2a2cbf6d63.tar.gz busybox-w32-9db164d6e39050d09f38288c6045cd2a2cbf6d63.tar.bz2 busybox-w32-9db164d6e39050d09f38288c6045cd2a2cbf6d63.zip | |
Merge commit 'd84b175cb6948eb17f847313bf912174e2f934e1' into merge
Conflicts:
include/platform.h
Diffstat (limited to 'procps/ps.c')
| -rw-r--r-- | procps/ps.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/procps/ps.c b/procps/ps.c index 41124279d..af57f7aee 100644 --- a/procps/ps.c +++ b/procps/ps.c | |||
| @@ -62,6 +62,9 @@ enum { MAX_WIDTH = 2*1024 }; | |||
| 62 | 62 | ||
| 63 | #if ENABLE_DESKTOP | 63 | #if ENABLE_DESKTOP |
| 64 | 64 | ||
| 65 | #ifdef __linux__ | ||
| 66 | # include <sys/sysinfo.h> | ||
| 67 | #endif | ||
| 65 | #include <sys/times.h> /* for times() */ | 68 | #include <sys/times.h> /* for times() */ |
| 66 | #ifndef AT_CLKTCK | 69 | #ifndef AT_CLKTCK |
| 67 | # define AT_CLKTCK 17 | 70 | # define AT_CLKTCK 17 |