summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Andersen2001-01-02 01:16:38 +0000
committerEric Andersen2001-01-02 01:16:38 +0000
commit01bda5de6b983cf331c42cb64fa2ccd4308b423d (patch)
tree363d4c2ee9254618b05b594ab89e9d2861587549
parent27c7bec4d4d3dffba20a30cab7ba23e83fd5283f (diff)
downloadbusybox-01bda5de6b983cf331c42cb64fa2ccd4308b423d.zip
busybox-01bda5de6b983cf331c42cb64fa2ccd4308b423d.tar.gz
Better dmalloc handling
-rw-r--r--busybox.h10
-rw-r--r--include/busybox.h10
2 files changed, 10 insertions, 10 deletions
diff --git a/busybox.h b/busybox.h
index ae256fe..a89ac36 100644
--- a/busybox.h
+++ b/busybox.h
@@ -26,10 +26,6 @@
#include "Config.h"
-#ifdef DMALLOC
-#include "dmalloc.h"
-#endif
-
#include <stdlib.h>
#include <stdarg.h>
#include <string.h>
@@ -37,12 +33,16 @@
#include <errno.h>
#include <sys/stat.h>
#include <sys/param.h>
+#include <sys/types.h>
#include <mntent.h>
#include <regex.h>
/* for the _syscall() macros */
#include <sys/syscall.h>
#include <linux/unistd.h>
+#ifdef DMALLOC
+#include "dmalloc.h"
+#endif
/* Some useful definitions */
#define FALSE ((int) 0)
@@ -183,7 +183,7 @@ extern void xregcomp(regex_t *preg, const char *regex, int cflags);
extern FILE *wfopen(const char *path, const char *mode);
extern FILE *xfopen(const char *path, const char *mode);
-#ifndef DMALLOC
+#ifndef DMALLOC
extern void *xmalloc (size_t size);
extern void *xrealloc(void *old, size_t size);
extern void *xcalloc(size_t nmemb, size_t size);
diff --git a/include/busybox.h b/include/busybox.h
index ae256fe..a89ac36 100644
--- a/include/busybox.h
+++ b/include/busybox.h
@@ -26,10 +26,6 @@
#include "Config.h"
-#ifdef DMALLOC
-#include "dmalloc.h"
-#endif
-
#include <stdlib.h>
#include <stdarg.h>
#include <string.h>
@@ -37,12 +33,16 @@
#include <errno.h>
#include <sys/stat.h>
#include <sys/param.h>
+#include <sys/types.h>
#include <mntent.h>
#include <regex.h>
/* for the _syscall() macros */
#include <sys/syscall.h>
#include <linux/unistd.h>
+#ifdef DMALLOC
+#include "dmalloc.h"
+#endif
/* Some useful definitions */
#define FALSE ((int) 0)
@@ -183,7 +183,7 @@ extern void xregcomp(regex_t *preg, const char *regex, int cflags);
extern FILE *wfopen(const char *path, const char *mode);
extern FILE *xfopen(const char *path, const char *mode);
-#ifndef DMALLOC
+#ifndef DMALLOC
extern void *xmalloc (size_t size);
extern void *xrealloc(void *old, size_t size);
extern void *xcalloc(size_t nmemb, size_t size);