diff options
| author | Michael Brown | 2007-09-11 16:42:17 +0200 |
|---|---|---|
| committer | Michael Brown | 2007-09-11 16:42:17 +0200 |
| commit | 5f6439c828c1de42ba83593040842b30e86d6b29 (patch) | |
| tree | 112970ab2eede1a23f57742a3c60f25fe8371688 /src/include/stdlib.h | |
| parent | Force MAC address for testing purposes (diff) | |
| parent | Merge branch 'master' of rom.etherboot.org:/pub/scm/gpxe (diff) | |
| download | ipxe-5f6439c828c1de42ba83593040842b30e86d6b29.tar.gz ipxe-5f6439c828c1de42ba83593040842b30e86d6b29.tar.xz ipxe-5f6439c828c1de42ba83593040842b30e86d6b29.zip | |
Merge branch 'master' into 3leaf-rewrite
Diffstat (limited to 'src/include/stdlib.h')
| -rw-r--r-- | src/include/stdlib.h | 6 |
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 ); } |