diff options
author | andersen <andersen@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2001-02-20 06:14:08 +0000 |
---|---|---|
committer | andersen <andersen@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2001-02-20 06:14:08 +0000 |
commit | b59ae6c5acd924f88fc9cb4285ed283f27c65194 (patch) | |
tree | 49d1bb722d95eb1aded6b5d354ac86e56c481c10 /procps | |
parent | 59d90b8337e20463074c14f5215e7f2fdeb800ad (diff) | |
download | busybox-w32-b59ae6c5acd924f88fc9cb4285ed283f27c65194.tar.gz busybox-w32-b59ae6c5acd924f88fc9cb4285ed283f27c65194.tar.bz2 busybox-w32-b59ae6c5acd924f88fc9cb4285ed283f27c65194.zip |
It turns out that DODMALLOC was broken when I reorganized busybox.h
header file usage before the 0.49 release. To fix it, I had to move
the '#include "busybox.h"' to the end of the list of #include files.
-Erik
git-svn-id: svn://busybox.net/trunk/busybox@1864 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'procps')
-rw-r--r-- | procps/free.c | 2 | ||||
-rw-r--r-- | procps/kill.c | 2 | ||||
-rw-r--r-- | procps/ps.c | 2 | ||||
-rw-r--r-- | procps/renice.c | 2 | ||||
-rw-r--r-- | procps/uptime.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/procps/free.c b/procps/free.c index d287c03f5..41e872d12 100644 --- a/procps/free.c +++ b/procps/free.c | |||
@@ -21,10 +21,10 @@ | |||
21 | * | 21 | * |
22 | */ | 22 | */ |
23 | 23 | ||
24 | #include "busybox.h" | ||
25 | #include <stdio.h> | 24 | #include <stdio.h> |
26 | #include <errno.h> | 25 | #include <errno.h> |
27 | #include <stdlib.h> | 26 | #include <stdlib.h> |
27 | #include "busybox.h" | ||
28 | 28 | ||
29 | extern int free_main(int argc, char **argv) | 29 | extern int free_main(int argc, char **argv) |
30 | { | 30 | { |
diff --git a/procps/kill.c b/procps/kill.c index bdd22b52d..e62503b3c 100644 --- a/procps/kill.c +++ b/procps/kill.c | |||
@@ -21,7 +21,6 @@ | |||
21 | */ | 21 | */ |
22 | 22 | ||
23 | 23 | ||
24 | #include "busybox.h" | ||
25 | #include <stdio.h> | 24 | #include <stdio.h> |
26 | #include <stdlib.h> | 25 | #include <stdlib.h> |
27 | #include <errno.h> | 26 | #include <errno.h> |
@@ -30,6 +29,7 @@ | |||
30 | #include <ctype.h> | 29 | #include <ctype.h> |
31 | #include <string.h> | 30 | #include <string.h> |
32 | #include <unistd.h> | 31 | #include <unistd.h> |
32 | #include "busybox.h" | ||
33 | 33 | ||
34 | static const int KILL = 0; | 34 | static const int KILL = 0; |
35 | static const int KILLALL = 1; | 35 | static const int KILLALL = 1; |
diff --git a/procps/ps.c b/procps/ps.c index dd154af9d..4ce43c47f 100644 --- a/procps/ps.c +++ b/procps/ps.c | |||
@@ -28,7 +28,6 @@ | |||
28 | * | 28 | * |
29 | */ | 29 | */ |
30 | 30 | ||
31 | #include "busybox.h" | ||
32 | #include <stdio.h> | 31 | #include <stdio.h> |
33 | #include <stdlib.h> | 32 | #include <stdlib.h> |
34 | #include <unistd.h> | 33 | #include <unistd.h> |
@@ -38,6 +37,7 @@ | |||
38 | #include <ctype.h> | 37 | #include <ctype.h> |
39 | #include <string.h> | 38 | #include <string.h> |
40 | #include <sys/ioctl.h> | 39 | #include <sys/ioctl.h> |
40 | #include "busybox.h" | ||
41 | #define BB_DECLARE_EXTERN | 41 | #define BB_DECLARE_EXTERN |
42 | #define bb_need_help | 42 | #define bb_need_help |
43 | #include "messages.c" | 43 | #include "messages.c" |
diff --git a/procps/renice.c b/procps/renice.c index 9180ebf81..ec35bdcde 100644 --- a/procps/renice.c +++ b/procps/renice.c | |||
@@ -20,12 +20,12 @@ | |||
20 | * | 20 | * |
21 | */ | 21 | */ |
22 | 22 | ||
23 | #include "busybox.h" | ||
24 | #include <stdio.h> | 23 | #include <stdio.h> |
25 | #include <errno.h> | 24 | #include <errno.h> |
26 | #include <stdlib.h> | 25 | #include <stdlib.h> |
27 | #include <sys/time.h> | 26 | #include <sys/time.h> |
28 | #include <sys/resource.h> | 27 | #include <sys/resource.h> |
28 | #include "busybox.h" | ||
29 | 29 | ||
30 | 30 | ||
31 | extern int renice_main(int argc, char **argv) | 31 | extern int renice_main(int argc, char **argv) |
diff --git a/procps/uptime.c b/procps/uptime.c index 213a39851..64df194f4 100644 --- a/procps/uptime.c +++ b/procps/uptime.c | |||
@@ -28,11 +28,11 @@ | |||
28 | */ | 28 | */ |
29 | 29 | ||
30 | 30 | ||
31 | #include "busybox.h" | ||
32 | #include <stdio.h> | 31 | #include <stdio.h> |
33 | #include <time.h> | 32 | #include <time.h> |
34 | #include <errno.h> | 33 | #include <errno.h> |
35 | #include <stdlib.h> | 34 | #include <stdlib.h> |
35 | #include "busybox.h" | ||
36 | 36 | ||
37 | static const int FSHIFT = 16; /* nr of bits of precision */ | 37 | static const int FSHIFT = 16; /* nr of bits of precision */ |
38 | #define FIXED_1 (1<<FSHIFT) /* 1.0 as fixed-point */ | 38 | #define FIXED_1 (1<<FSHIFT) /* 1.0 as fixed-point */ |