Merge tag 'syslinux-5.00' into firmwaresyslinux-6.00-pre3

Conflicts:
	Makefile
	com32/elflink/ldlinux/Makefile
	com32/lib/sys/module/elf_module.c
	core/cleanup.c
	core/comboot.inc
	core/conio.c
	core/fs/fs.c
	core/init.c
	core/mem/free.c
	core/mem/malloc.c
	core/timer.inc
	diag/geodsp/Makefile
	extlinux/main.c
	mk/embedded.mk
	modules/Makefile

Signed-off-by: Matt Fleming <matt.fleming@intel.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/core/mem/malloc.c b/core/mem/malloc.c
index fe8af5ad..a3d6b45d 100644
--- a/core/mem/malloc.c
+++ b/core/mem/malloc.c
@@ -96,12 +96,12 @@ static void *_malloc(size_t size, enum heap heap, malloc_tag_t tag)
     return p;
 }
 
-void *malloc(size_t size)
+__export void *malloc(size_t size)
 {
     return _malloc(size, HEAP_MAIN, MALLOC_CORE);
 }
 
-void *lmalloc(size_t size)
+__export void *lmalloc(size_t size)
 {
     void *p;
 
@@ -217,12 +217,12 @@ void *bios_realloc(void *ptr, size_t size)
     }
 }
 
-void *realloc(void *ptr, size_t size)
+__export void *realloc(void *ptr, size_t size)
 {
     return firmware->mem->realloc(ptr, size);
 }
 
-void *zalloc(size_t size)
+__export void *zalloc(size_t size)
 {
     void *ptr;