projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-usb
[oweals/u-boot.git]
/
include
/
malloc.h
diff --git
a/include/malloc.h
b/include/malloc.h
index b714fedf4572589b2350eeb3e1508a4420a2f16b..5efa6920b2a17ee83b45f18f4a30004426a72ed0 100644
(file)
--- a/
include/malloc.h
+++ b/
include/malloc.h
@@
-878,7
+878,6
@@
extern Void_t* sbrk();
#define memalign memalign_simple
static inline void free(void *ptr) {}
void *calloc(size_t nmemb, size_t size);
#define memalign memalign_simple
static inline void free(void *ptr) {}
void *calloc(size_t nmemb, size_t size);
-void *memalign_simple(size_t alignment, size_t bytes);
void *realloc_simple(void *ptr, size_t size);
void malloc_simple_info(void);
#else
void *realloc_simple(void *ptr, size_t size);
void malloc_simple_info(void);
#else
@@
-914,6
+913,7
@@
int initf_malloc(void);
/* Simple versions which can be used when space is tight */
void *malloc_simple(size_t size);
/* Simple versions which can be used when space is tight */
void *malloc_simple(size_t size);
+void *memalign_simple(size_t alignment, size_t bytes);
#pragma GCC visibility push(hidden)
# if __STD_C
#pragma GCC visibility push(hidden)
# if __STD_C