diff options
| author | Eric Andersen <andersen@codepoet.org> | 2001-01-02 01:16:38 +0000 |
|---|---|---|
| committer | Eric Andersen <andersen@codepoet.org> | 2001-01-02 01:16:38 +0000 |
| commit | 01bda5de6b983cf331c42cb64fa2ccd4308b423d (patch) | |
| tree | 363d4c2ee9254618b05b594ab89e9d2861587549 | |
| parent | 27c7bec4d4d3dffba20a30cab7ba23e83fd5283f (diff) | |
| download | busybox-w32-01bda5de6b983cf331c42cb64fa2ccd4308b423d.tar.gz busybox-w32-01bda5de6b983cf331c42cb64fa2ccd4308b423d.tar.bz2 busybox-w32-01bda5de6b983cf331c42cb64fa2ccd4308b423d.zip | |
Better dmalloc handling
| -rw-r--r-- | busybox.h | 10 | ||||
| -rw-r--r-- | include/busybox.h | 10 |
2 files changed, 10 insertions, 10 deletions
| @@ -26,10 +26,6 @@ | |||
| 26 | 26 | ||
| 27 | #include "Config.h" | 27 | #include "Config.h" |
| 28 | 28 | ||
| 29 | #ifdef DMALLOC | ||
| 30 | #include "dmalloc.h" | ||
| 31 | #endif | ||
| 32 | |||
| 33 | #include <stdlib.h> | 29 | #include <stdlib.h> |
| 34 | #include <stdarg.h> | 30 | #include <stdarg.h> |
| 35 | #include <string.h> | 31 | #include <string.h> |
| @@ -37,12 +33,16 @@ | |||
| 37 | #include <errno.h> | 33 | #include <errno.h> |
| 38 | #include <sys/stat.h> | 34 | #include <sys/stat.h> |
| 39 | #include <sys/param.h> | 35 | #include <sys/param.h> |
| 36 | #include <sys/types.h> | ||
| 40 | #include <mntent.h> | 37 | #include <mntent.h> |
| 41 | #include <regex.h> | 38 | #include <regex.h> |
| 42 | /* for the _syscall() macros */ | 39 | /* for the _syscall() macros */ |
| 43 | #include <sys/syscall.h> | 40 | #include <sys/syscall.h> |
| 44 | #include <linux/unistd.h> | 41 | #include <linux/unistd.h> |
| 45 | 42 | ||
| 43 | #ifdef DMALLOC | ||
| 44 | #include "dmalloc.h" | ||
| 45 | #endif | ||
| 46 | 46 | ||
| 47 | /* Some useful definitions */ | 47 | /* Some useful definitions */ |
| 48 | #define FALSE ((int) 0) | 48 | #define FALSE ((int) 0) |
| @@ -183,7 +183,7 @@ extern void xregcomp(regex_t *preg, const char *regex, int cflags); | |||
| 183 | extern FILE *wfopen(const char *path, const char *mode); | 183 | extern FILE *wfopen(const char *path, const char *mode); |
| 184 | extern FILE *xfopen(const char *path, const char *mode); | 184 | extern FILE *xfopen(const char *path, const char *mode); |
| 185 | 185 | ||
| 186 | #ifndef DMALLOC | 186 | #ifndef DMALLOC |
| 187 | extern void *xmalloc (size_t size); | 187 | extern void *xmalloc (size_t size); |
| 188 | extern void *xrealloc(void *old, size_t size); | 188 | extern void *xrealloc(void *old, size_t size); |
| 189 | extern void *xcalloc(size_t nmemb, size_t size); | 189 | extern void *xcalloc(size_t nmemb, size_t size); |
diff --git a/include/busybox.h b/include/busybox.h index ae256fe7b..a89ac3694 100644 --- a/include/busybox.h +++ b/include/busybox.h | |||
| @@ -26,10 +26,6 @@ | |||
| 26 | 26 | ||
| 27 | #include "Config.h" | 27 | #include "Config.h" |
| 28 | 28 | ||
| 29 | #ifdef DMALLOC | ||
| 30 | #include "dmalloc.h" | ||
| 31 | #endif | ||
| 32 | |||
| 33 | #include <stdlib.h> | 29 | #include <stdlib.h> |
| 34 | #include <stdarg.h> | 30 | #include <stdarg.h> |
| 35 | #include <string.h> | 31 | #include <string.h> |
| @@ -37,12 +33,16 @@ | |||
| 37 | #include <errno.h> | 33 | #include <errno.h> |
| 38 | #include <sys/stat.h> | 34 | #include <sys/stat.h> |
| 39 | #include <sys/param.h> | 35 | #include <sys/param.h> |
| 36 | #include <sys/types.h> | ||
| 40 | #include <mntent.h> | 37 | #include <mntent.h> |
| 41 | #include <regex.h> | 38 | #include <regex.h> |
| 42 | /* for the _syscall() macros */ | 39 | /* for the _syscall() macros */ |
| 43 | #include <sys/syscall.h> | 40 | #include <sys/syscall.h> |
| 44 | #include <linux/unistd.h> | 41 | #include <linux/unistd.h> |
| 45 | 42 | ||
| 43 | #ifdef DMALLOC | ||
| 44 | #include "dmalloc.h" | ||
| 45 | #endif | ||
| 46 | 46 | ||
| 47 | /* Some useful definitions */ | 47 | /* Some useful definitions */ |
| 48 | #define FALSE ((int) 0) | 48 | #define FALSE ((int) 0) |
| @@ -183,7 +183,7 @@ extern void xregcomp(regex_t *preg, const char *regex, int cflags); | |||
| 183 | extern FILE *wfopen(const char *path, const char *mode); | 183 | extern FILE *wfopen(const char *path, const char *mode); |
| 184 | extern FILE *xfopen(const char *path, const char *mode); | 184 | extern FILE *xfopen(const char *path, const char *mode); |
| 185 | 185 | ||
| 186 | #ifndef DMALLOC | 186 | #ifndef DMALLOC |
| 187 | extern void *xmalloc (size_t size); | 187 | extern void *xmalloc (size_t size); |
| 188 | extern void *xrealloc(void *old, size_t size); | 188 | extern void *xrealloc(void *old, size_t size); |
| 189 | extern void *xcalloc(size_t nmemb, size_t size); | 189 | extern void *xcalloc(size_t nmemb, size_t size); |