summaryrefslogtreecommitdiffstats
path: root/src/include/stdlib.h
diff options
context:
space:
mode:
authorHolger Lubitz2007-08-23 23:10:59 +0200
committerHolger Lubitz2007-08-23 23:10:59 +0200
commit376bacab6775b2f579db9e6143a628f7c960efb5 (patch)
tree8fb0d6d2d7066bdbc54f3540fa9564c0ad290127 /src/include/stdlib.h
parentMerge branch 'master' of git://git.etherboot.org/scm/gpxe (diff)
parentMerge commit 'holger/strings' (diff)
downloadipxe-376bacab6775b2f579db9e6143a628f7c960efb5.tar.gz
ipxe-376bacab6775b2f579db9e6143a628f7c960efb5.tar.xz
ipxe-376bacab6775b2f579db9e6143a628f7c960efb5.zip
Merge branch 'master' of git://git.etherboot.org/scm/gpxe
Diffstat (limited to 'src/include/stdlib.h')
-rw-r--r--src/include/stdlib.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/include/stdlib.h b/src/include/stdlib.h
index 5c8fc3df4..ae9969622 100644
--- a/src/include/stdlib.h
+++ b/src/include/stdlib.h
@@ -20,10 +20,10 @@ extern unsigned long strtoul ( const char *p, char **endp, int base );
****************************************************************************
*/
-extern void * malloc ( size_t size );
+extern void * __malloc malloc ( size_t size );
extern void * realloc ( void *old_ptr, size_t new_size );
extern void free ( void *ptr );
-extern void * zalloc ( size_t len );
+extern void * __malloc zalloc ( size_t len );
/**
* Allocate cleared memory
@@ -38,7 +38,7 @@ extern void * zalloc ( size_t len );
* function in zalloc(), since in most cases @c nmemb will be 1 and
* doing the multiply is just wasteful.
*/
-static inline void * calloc ( size_t nmemb, size_t size ) {
+static inline void * __malloc calloc ( size_t nmemb, size_t size ) {
return zalloc ( nmemb * size );
}