From 529641592a19f47a8944f0afd870c923bb3cc788 Mon Sep 17 00:00:00 2001
From: Max Wash <max@doorstuck.net>
Date: Fri, 15 May 2020 19:28:51 +0100
Subject: [PATCH] Moved malloc implementations to a separate folder

---
 .../libc/{stdlib => malloc}/dlmalloc/malloc.c   | 17 +++++++++++------
 .../libc/{stdlib => malloc}/dlmalloc/malloc.h   |  0
 2 files changed, 11 insertions(+), 6 deletions(-)
 rename photon/libc/{stdlib => malloc}/dlmalloc/malloc.c (99%)
 rename photon/libc/{stdlib => malloc}/dlmalloc/malloc.h (100%)

diff --git a/photon/libc/stdlib/dlmalloc/malloc.c b/photon/libc/malloc/dlmalloc/malloc.c
similarity index 99%
rename from photon/libc/stdlib/dlmalloc/malloc.c
rename to photon/libc/malloc/dlmalloc/malloc.c
index d38f1c6..4942e8b 100644
--- a/photon/libc/stdlib/dlmalloc/malloc.c
+++ b/photon/libc/malloc/dlmalloc/malloc.c
@@ -231,12 +231,23 @@
 
 /* #define WIN32 */
 
+#if __STD_C
+#include <stddef.h>   /* for size_t */
+#else
+#include <sys/types.h>
+#endif
+
 #ifdef __magenta__
 #define LACKS_UNISTD_H
 #define LACKS_SYS_PARAM_H
 #define LACKS_SYS_MMAN_H
 
+extern void *__extend_heap(size_t sz);
+
 #define HAVE_MMAP 0
+#define MORECORE __extend_heap
+#define MORECORE_CONTIGUOUS 1
+
 #endif
 
 #ifdef WIN32
@@ -311,12 +322,6 @@ static int cpuinfo (int whole, unsigned long*kernel, unsigned long*user);
 #endif
 #endif /*Void_t*/
 
-#if __STD_C
-#include <stddef.h>   /* for size_t */
-#else
-#include <sys/types.h>
-#endif
-
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/photon/libc/stdlib/dlmalloc/malloc.h b/photon/libc/malloc/dlmalloc/malloc.h
similarity index 100%
rename from photon/libc/stdlib/dlmalloc/malloc.h
rename to photon/libc/malloc/dlmalloc/malloc.h