emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Better dmalloc handling

Browse Source
This commit is contained in:
Eric Andersen 2001-01-02 01:16:38 +00:00
parent 27c7bec4d4
commit 01bda5de6b
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
busybox.h
View File

@ -26,10 +26,6 @@
#include "Config.h" #include "Config.h"
#ifdef DMALLOC
#include "dmalloc.h"
#endif
#include <stdlib.h> #include <stdlib.h>
#include <stdarg.h> #include <stdarg.h>
#include <string.h> #include <string.h>
@ -37,12 +33,16 @@
#include <errno.h> #include <errno.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/param.h> #include <sys/param.h>
#include <sys/types.h>
#include <mntent.h> #include <mntent.h>
#include <regex.h> #include <regex.h>
/* for the _syscall() macros */ /* for the _syscall() macros */
#include <sys/syscall.h> #include <sys/syscall.h>
#include <linux/unistd.h> #include <linux/unistd.h>
#ifdef DMALLOC
#include "dmalloc.h"
#endif
/* Some useful definitions */ /* Some useful definitions */
#define FALSE ((int) 0) #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 *wfopen(const char *path, const char *mode);
extern FILE *xfopen(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 *xmalloc (size_t size);
extern void *xrealloc(void *old, size_t size); extern void *xrealloc(void *old, size_t size);
extern void *xcalloc(size_t nmemb, size_t size); extern void *xcalloc(size_t nmemb, size_t size);

10
include/busybox.h
View File

@ -26,10 +26,6 @@
#include "Config.h" #include "Config.h"
#ifdef DMALLOC
#include "dmalloc.h"
#endif
#include <stdlib.h> #include <stdlib.h>
#include <stdarg.h> #include <stdarg.h>
#include <string.h> #include <string.h>
@ -37,12 +33,16 @@
#include <errno.h> #include <errno.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/param.h> #include <sys/param.h>
#include <sys/types.h>
#include <mntent.h> #include <mntent.h>
#include <regex.h> #include <regex.h>
/* for the _syscall() macros */ /* for the _syscall() macros */
#include <sys/syscall.h> #include <sys/syscall.h>
#include <linux/unistd.h> #include <linux/unistd.h>
#ifdef DMALLOC
#include "dmalloc.h"
#endif
/* Some useful definitions */ /* Some useful definitions */
#define FALSE ((int) 0) #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 *wfopen(const char *path, const char *mode);
extern FILE *xfopen(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 *xmalloc (size_t size);
extern void *xrealloc(void *old, size_t size); extern void *xrealloc(void *old, size_t size);
extern void *xcalloc(size_t nmemb, size_t size); extern void *xcalloc(size_t nmemb, size_t size);