projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
dm: pci: change bus number register setting compliant with Linux
[oweals/u-boot.git]
/
lib
/
zlib
/
zutil.c
diff --git
a/lib/zlib/zutil.c
b/lib/zlib/zutil.c
index 173a81d1ea4df76325f2f45cbe82aa8e3e10641c..227343e48d3fb1305a229ac4b72559bda6351b48 100644
(file)
--- a/
lib/zlib/zutil.c
+++ b/
lib/zlib/zutil.c
@@
-43,7
+43,9
@@
void z_error (m)
*/
#ifndef MY_ZCALLOC /* Any system without a special alloc function */
-#ifndef __UBOOT__
+#ifdef __UBOOT__
+#include <malloc.h>
+#else
#ifndef STDC
extern voidp malloc OF((uInt size));
extern voidp calloc OF((uInt items, uInt size));