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

9 files changed, 10 insertions, 10 deletions

diff --git a/console-tools/chvt.c b/console-tools/chvt.c
index f2e6d5f17..c4b3639df 100644
--- a/console-tools/chvt.c
+++ b/console-tools/chvt.c
@@ -4,12 +4,12 @@
  *
  * busyboxed by Erik Andersen
  */
-#include "busybox.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <fcntl.h>
 #include <sys/types.h>
 #include <sys/ioctl.h>
+#include "busybox.h"
 
 /* From <linux/vt.h> */
 static const int VT_ACTIVATE = 0x5606;  /* make vt active */
diff --git a/console-tools/clear.c b/console-tools/clear.c
index dab4b05a7..503bafa16 100644
--- a/console-tools/clear.c
+++ b/console-tools/clear.c
@@ -22,9 +22,9 @@
  *
  */
 
-#include "busybox.h"
 #include <stdio.h>
 #include <stdlib.h>
+#include "busybox.h"
 
 
 extern int clear_main(int argc, char **argv)
diff --git a/console-tools/deallocvt.c b/console-tools/deallocvt.c
index 8c390c261..15cd0c9b9 100644
--- a/console-tools/deallocvt.c
+++ b/console-tools/deallocvt.c
@@ -3,12 +3,12 @@
  * disalloc.c - aeb - 940501 - Disallocate virtual terminal(s)
  * Renamed deallocvt.
  */
-#include "busybox.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <fcntl.h>
 #include <sys/types.h>
 #include <sys/ioctl.h>
+#include "busybox.h"
 
 /* From <linux/vt.h> */
 static const int VT_DISALLOCATE = 0x5608;  /* free memory associated to vt */
diff --git a/console-tools/dumpkmap.c b/console-tools/dumpkmap.c
index b9f1bd233..0da01868b 100644
--- a/console-tools/dumpkmap.c
+++ b/console-tools/dumpkmap.c
@@ -20,7 +20,6 @@
  *
  */
 
-#include "busybox.h"
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
@@ -28,6 +27,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <sys/ioctl.h>
+#include "busybox.h"
 
 /* From <linux/kd.h> */
 struct kbentry {
diff --git a/console-tools/loadacm.c b/console-tools/loadacm.c
index 6422137a1..81b973b02 100644
--- a/console-tools/loadacm.c
+++ b/console-tools/loadacm.c
@@ -7,7 +7,6 @@
  * Peter Novodvorsky <petya@logic.ru>
  */
 
-#include "busybox.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <memory.h>
@@ -17,9 +16,10 @@
 #include <assert.h>
 #include <errno.h>
 #include <signal.h>
+#include <sys/kd.h>
 #include <sys/types.h>
 #include <sys/ioctl.h>
-#include <sys/kd.h>
+#include "busybox.h"
 
 typedef unsigned short unicode;
 
diff --git a/console-tools/loadfont.c b/console-tools/loadfont.c
index d7bd7e8f5..1a724ca85 100644
--- a/console-tools/loadfont.c
+++ b/console-tools/loadfont.c
@@ -7,7 +7,6 @@
  * Loads the console font, and possibly the corresponding screen map(s).
  * (Adapted for busybox by Matej Vela.)
  */
-#include "busybox.h"
 #include <stdio.h>
 #include <string.h>
 #include <fcntl.h>
@@ -20,6 +19,7 @@
 #include <sys/ioctl.h>
 #include <sys/kd.h>
 #include <endian.h>
+#include "busybox.h"
 
 static const int PSF_MAGIC1 = 0x36;
 static const int PSF_MAGIC2 = 0x04;
diff --git a/console-tools/loadkmap.c b/console-tools/loadkmap.c
index 5ecd819f9..dcb5c1caa 100644
--- a/console-tools/loadkmap.c
+++ b/console-tools/loadkmap.c
@@ -20,7 +20,6 @@
  *
  */
 
-#include "busybox.h"
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
@@ -28,6 +27,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <sys/ioctl.h>
+#include "busybox.h"
 
 #define BINARY_KEYMAP_MAGIC "bkeymap"
 
diff --git a/console-tools/reset.c b/console-tools/reset.c
index 294cab3c4..755c4c335 100644
--- a/console-tools/reset.c
+++ b/console-tools/reset.c
@@ -23,9 +23,9 @@
  *
  */
 
-#include "busybox.h"
 #include <stdio.h>
 #include <stdlib.h>
+#include "busybox.h"
 
 extern int reset_main(int argc, char **argv)
 {
diff --git a/console-tools/setkeycodes.c b/console-tools/setkeycodes.c
index 0be4724ca..c3c7e09aa 100644
--- a/console-tools/setkeycodes.c
+++ b/console-tools/setkeycodes.c
@@ -22,11 +22,11 @@
  *
  */
 
-#include "busybox.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
+#include "busybox.h"
 
 
 /* From <linux/kd.h> */