diff options
| author | vapier <vapier@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2005-08-27 18:18:06 +0000 |
|---|---|---|
| committer | vapier <vapier@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2005-08-27 18:18:06 +0000 |
| commit | 1bd6bb83f552b3456e6eee8442c9a226d085e443 (patch) | |
| tree | 481558d96e646c63caee86475985db1904e9bea0 /procps | |
| parent | 21ccf1fc21674fdd700d1f29fdc0af4b3202a316 (diff) | |
| download | busybox-w32-1bd6bb83f552b3456e6eee8442c9a226d085e443.tar.gz busybox-w32-1bd6bb83f552b3456e6eee8442c9a226d085e443.tar.bz2 busybox-w32-1bd6bb83f552b3456e6eee8442c9a226d085e443.zip | |
some portability fixes by rmh in Bug 395
git-svn-id: svn://busybox.net/trunk/busybox@11266 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'procps')
| -rw-r--r-- | procps/top.c | 2 | ||||
| -rw-r--r-- | procps/uptime.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/procps/top.c b/procps/top.c index e6e4b5c00..fcb570b64 100644 --- a/procps/top.c +++ b/procps/top.c | |||
| @@ -33,8 +33,6 @@ | |||
| 33 | #include <unistd.h> | 33 | #include <unistd.h> |
| 34 | #include <string.h> | 34 | #include <string.h> |
| 35 | #include <sys/ioctl.h> | 35 | #include <sys/ioctl.h> |
| 36 | /* get page info */ | ||
| 37 | #include <asm/page.h> | ||
| 38 | #include "busybox.h" | 36 | #include "busybox.h" |
| 39 | 37 | ||
| 40 | //#define FEATURE_CPU_USAGE_PERCENTAGE /* + 2k */ | 38 | //#define FEATURE_CPU_USAGE_PERCENTAGE /* + 2k */ |
diff --git a/procps/uptime.c b/procps/uptime.c index 38d58af9c..004288993 100644 --- a/procps/uptime.c +++ b/procps/uptime.c | |||
| @@ -35,7 +35,9 @@ | |||
| 35 | #include <stdlib.h> | 35 | #include <stdlib.h> |
| 36 | #include "busybox.h" | 36 | #include "busybox.h" |
| 37 | 37 | ||
| 38 | static const int FSHIFT = 16; /* nr of bits of precision */ | 38 | #ifndef FSHIFT |
| 39 | # define FSHIFT 16 /* nr of bits of precision */ | ||
| 40 | #endif | ||
| 39 | #define FIXED_1 (1<<FSHIFT) /* 1.0 as fixed-point */ | 41 | #define FIXED_1 (1<<FSHIFT) /* 1.0 as fixed-point */ |
| 40 | #define LOAD_INT(x) ((x) >> FSHIFT) | 42 | #define LOAD_INT(x) ((x) >> FSHIFT) |
| 41 | #define LOAD_FRAC(x) LOAD_INT(((x) & (FIXED_1-1)) * 100) | 43 | #define LOAD_FRAC(x) LOAD_INT(((x) & (FIXED_1-1)) * 100) |