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
This commit is contained in:
@@ -29,11 +29,6 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "busybox.h"
|
||||
#define BB_DECLARE_EXTERN
|
||||
#define bb_need_memory_exhausted
|
||||
#include "messages.c"
|
||||
|
||||
/* These defines are very important for BusyBox. Without these,
|
||||
* huge chunks of ram are pre-allocated making the BusyBox bss
|
||||
* size Freaking Huge(tm), which is a bad thing.*/
|
||||
@@ -43,9 +38,15 @@
|
||||
/* I don't like nested includes, but the string and io functions are used
|
||||
* too often
|
||||
*/
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
#include "busybox.h"
|
||||
#define BB_DECLARE_EXTERN
|
||||
#define bb_need_memory_exhausted
|
||||
#include "messages.c"
|
||||
|
||||
#define memzero(s, n) memset ((void *)(s), 0, (n))
|
||||
|
||||
#ifndef RETSIGTYPE
|
||||
@@ -1628,12 +1629,6 @@ ulg deflate()
|
||||
# include <unistd.h>
|
||||
#endif
|
||||
|
||||
#if defined(STDC_HEADERS) || !defined(NO_STDLIB_H)
|
||||
# include <stdlib.h>
|
||||
#else
|
||||
extern int errno;
|
||||
#endif
|
||||
|
||||
#if defined(DIRENT)
|
||||
# include <dirent.h>
|
||||
typedef struct dirent dir_type;
|
||||
@@ -3098,12 +3093,6 @@ local void set_file_type()
|
||||
# include <fcntl.h>
|
||||
#endif
|
||||
|
||||
#if defined(STDC_HEADERS) || !defined(NO_STDLIB_H)
|
||||
# include <stdlib.h>
|
||||
#else
|
||||
extern int errno;
|
||||
#endif
|
||||
|
||||
/* ===========================================================================
|
||||
* Copy input to output unchanged: zcat == cat with --force.
|
||||
* IN assertion: insize bytes have already been read in inbuf.
|
||||
|
Reference in New Issue
Block a user