Move malloc portability tweaks out of system.h
- only rpmmalloc.c needs, no need to pollute system.h
This commit is contained in:
parent
4a1e75d139
commit
162fc36e14
|
@ -3,8 +3,18 @@
|
|||
*/
|
||||
|
||||
#include "system.h"
|
||||
|
||||
#if HAVE_MALLOC_H
|
||||
#include <malloc.h>
|
||||
#endif
|
||||
|
||||
#include "debug.h"
|
||||
|
||||
#if NEED_MYREALLOC
|
||||
#define realloc(ptr,size) myrealloc(ptr,size)
|
||||
extern void *myrealloc(void *, size_t);
|
||||
#endif
|
||||
|
||||
static rpmMemFailFunc failfunc = NULL;
|
||||
static void *failfunc_data = NULL;
|
||||
|
||||
|
|
9
system.h
9
system.h
|
@ -189,10 +189,6 @@ char *realpath(const char *path, char resolved_path []);
|
|||
#include <err.h>
|
||||
#endif
|
||||
|
||||
#if HAVE_MALLOC_H
|
||||
#include <malloc.h>
|
||||
#endif
|
||||
|
||||
#if WITH_SELINUX
|
||||
#include <selinux/selinux.h>
|
||||
#else
|
||||
|
@ -319,11 +315,6 @@ extern const char *__progname;
|
|||
#include <strings.h>
|
||||
#endif
|
||||
|
||||
#if NEED_MYREALLOC
|
||||
#define realloc(ptr,size) myrealloc(ptr,size)
|
||||
extern void *myrealloc(void *, size_t);
|
||||
#endif
|
||||
|
||||
#if ! HAVE_SETENV
|
||||
extern int setenv(const char *name, const char *value, int replace);
|
||||
extern void unsetenv(const char *name);
|
||||
|
|
Loading…
Reference in New Issue