aboutsummaryrefslogtreecommitdiff
path: root/miscutils
diff options
context:
space:
mode:
authorGravatar Eric Andersen <andersen@codepoet.org>2001-02-20 06:14:08 +0000
committerGravatar Eric Andersen <andersen@codepoet.org>2001-02-20 06:14:08 +0000
commitcbe31dace5fb24304694d399b9eb267fbe752516 (patch)
tree49d1bb722d95eb1aded6b5d354ac86e56c481c10 /miscutils
parent94456f598417f2f61edb97b5ab67ddfdc408ad10 (diff)
downloadbusybox-cbe31dace5fb24304694d399b9eb267fbe752516.tar.gz
busybox-cbe31dace5fb24304694d399b9eb267fbe752516.tar.bz2
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
Diffstat (limited to 'miscutils')
-rw-r--r--miscutils/dc.c2
-rw-r--r--miscutils/dutmp.c8
-rw-r--r--miscutils/makedevs.c2
-rw-r--r--miscutils/mktemp.c2
-rw-r--r--miscutils/mt.c2
-rw-r--r--miscutils/readlink.c2
-rw-r--r--miscutils/update.c2
-rw-r--r--miscutils/watchdog.c2
8 files changed, 11 insertions, 11 deletions
diff --git a/miscutils/dc.c b/miscutils/dc.c
index 1e34574ed..a422139b1 100644
--- a/miscutils/dc.c
+++ b/miscutils/dc.c
@@ -1,10 +1,10 @@
/* vi: set sw=4 ts=4: */
-#include "busybox.h"
#include <ctype.h>
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include <math.h>
+#include "busybox.h"
/* Tiny RPN calculator, because "expr" didn't give me bitwise operations. */
diff --git a/miscutils/dutmp.c b/miscutils/dutmp.c
index 2e6b3c056..a75a6e392 100644
--- a/miscutils/dutmp.c
+++ b/miscutils/dutmp.c
@@ -12,17 +12,17 @@
* Erik Andersen <andersen@lineo.com>
*/
-#include "busybox.h"
#include <sys/types.h>
#include <fcntl.h>
#include <errno.h>
-#define BB_DECLARE_EXTERN
-#define bb_need_io_error
-#include "messages.c"
#include <utmp.h>
#include <stdlib.h>
#include <unistd.h>
+#include "busybox.h"
+#define BB_DECLARE_EXTERN
+#define bb_need_io_error
+#include "messages.c"
extern int dutmp_main(int argc, char **argv)
{
diff --git a/miscutils/makedevs.c b/miscutils/makedevs.c
index eed3968c8..b8c6dd1d8 100644
--- a/miscutils/makedevs.c
+++ b/miscutils/makedevs.c
@@ -7,13 +7,13 @@
* known bugs: can't deal with alpha ranges
*/
-#include "busybox.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <fcntl.h>
#include <unistd.h>
#include <sys/types.h>
+#include "busybox.h"
int makedevs_main(int argc, char **argv)
{
diff --git a/miscutils/mktemp.c b/miscutils/mktemp.c
index b3522026e..31ab9e228 100644
--- a/miscutils/mktemp.c
+++ b/miscutils/mktemp.c
@@ -22,11 +22,11 @@
*
*/
-#include "busybox.h"
#include <stdio.h>
#include <errno.h>
#include <unistd.h>
#include <stdlib.h>
+#include "busybox.h"
extern int mktemp_main(int argc, char **argv)
{
diff --git a/miscutils/mt.c b/miscutils/mt.c
index eb93cb234..350d3ae5a 100644
--- a/miscutils/mt.c
+++ b/miscutils/mt.c
@@ -1,9 +1,9 @@
/* vi: set sw=4 ts=4: */
-#include "busybox.h"
#include <stdio.h>
#include <stdlib.h>
#include <sys/mtio.h>
#include <sys/fcntl.h>
+#include "busybox.h"
struct mt_opcodes {
char *name;
diff --git a/miscutils/readlink.c b/miscutils/readlink.c
index c82f64027..74196e11d 100644
--- a/miscutils/readlink.c
+++ b/miscutils/readlink.c
@@ -22,10 +22,10 @@
*
*/
-#include "busybox.h"
#include <errno.h>
#include <unistd.h>
#include <stdlib.h>
+#include "busybox.h"
int readlink_main(int argc, char **argv)
{
diff --git a/miscutils/update.c b/miscutils/update.c
index 2cf4a98b2..b282b9e18 100644
--- a/miscutils/update.c
+++ b/miscutils/update.c
@@ -28,7 +28,6 @@
* earlier) kernel. 2.2.x and higher flush filesystem buffers automatically.
*/
-#include "busybox.h"
#include <sys/param.h>
#include <sys/syslog.h>
#include <unistd.h> /* for getopt() */
@@ -42,6 +41,7 @@
#include <linux/unistd.h>
static _syscall2(int, bdflush, int, func, int, data);
#endif /* __GLIBC__ */
+#include "busybox.h"
static unsigned int sync_duration = 30;
static unsigned int flush_duration = 5;
diff --git a/miscutils/watchdog.c b/miscutils/watchdog.c
index 65d0fc35f..5b5fd6953 100644
--- a/miscutils/watchdog.c
+++ b/miscutils/watchdog.c
@@ -20,11 +20,11 @@
*
*/
-#include "busybox.h"
#include <stdio.h>
#include <fcntl.h>
#include <unistd.h>
#include <stdlib.h>
+#include "busybox.h"
extern int watchdog_main(int argc, char **argv)
{