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

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 @@
  *
  */
 
-#include "busybox.h"
 #include <stdio.h>
 #include <errno.h>
 #include <stdlib.h>
+#include "busybox.h"
 
 extern int free_main(int argc, char **argv)
 {
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 @@
  */
 
 
-#include "busybox.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
@@ -30,6 +29,7 @@
 #include <ctype.h>
 #include <string.h>
 #include <unistd.h>
+#include "busybox.h"
 
 static const int KILL = 0;
 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 @@
  *
  */
 
-#include "busybox.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -38,6 +37,7 @@
 #include <ctype.h>
 #include <string.h>
 #include <sys/ioctl.h>
+#include "busybox.h"
 #define BB_DECLARE_EXTERN
 #define bb_need_help
 #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 @@
  *
  */
 
-#include "busybox.h"
 #include <stdio.h>
 #include <errno.h>
 #include <stdlib.h>
 #include <sys/time.h>
 #include <sys/resource.h>
+#include "busybox.h"
 
 
 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 @@
  */
 
 
-#include "busybox.h"
 #include <stdio.h>
 #include <time.h>
 #include <errno.h>
 #include <stdlib.h>
+#include "busybox.h"
 
 static const int FSHIFT = 16;              /* nr of bits of precision */
 #define FIXED_1         (1<<FSHIFT)     /* 1.0 as fixed-point */