aboutsummaryrefslogtreecommitdiff
path: root/libc/inc
diff options
context:
space:
mode:
Diffstat (limited to 'libc/inc')
-rw-r--r--libc/inc/assert.h3
-rw-r--r--libc/inc/mem.h3
2 files changed, 3 insertions, 3 deletions
diff --git a/libc/inc/assert.h b/libc/inc/assert.h
index 3e45f44..e42fc5a 100644
--- a/libc/inc/assert.h
+++ b/libc/inc/assert.h
@@ -9,7 +9,8 @@
#include <proc.h>
#define assert(exp) \
if (!(exp)) { \
- printf("%s:%d: %s: Assertion '%s' failed\n", __FILE__, __LINE__, __func__, #exp); \
+ printf("%s:%d: %s: Kernel assertion '%s' failed\n", __FILE__, __LINE__, __func__, \
+ #exp); \
struct proc *assert_proc = proc_current(); \
if (assert_proc) \
proc_exit(assert_proc, 1); \
diff --git a/libc/inc/mem.h b/libc/inc/mem.h
index 15505fd..9075736 100644
--- a/libc/inc/mem.h
+++ b/libc/inc/mem.h
@@ -7,12 +7,11 @@
// Huh
#ifdef kernel
-#define HEAP_SIZE 0x10000
-#define HEAP_MAGIC 0x42
void heap_init(u32 start);
void *malloc(u32 size);
void free(void *ptr);
#elif defined(userspace)
+#include <print.h>
void *malloc(u32 size);
void free(void *ptr);
#else