summaryrefslogtreecommitdiff
path: root/src/user/lib
diff options
context:
space:
mode:
authordzwdz2022-07-26 18:16:10 +0200
committerdzwdz2022-07-26 18:16:10 +0200
commit18667c48b0cf6497b50c00f00f474d79a68f59ce (patch)
tree83029f59242d6b5f5d486284e6542a31f0cda415 /src/user/lib
parent13519597d98c9271b7856242d5625896d18803c5 (diff)
shared: move some headers from shared/ to camellia/
Diffstat (limited to 'src/user/lib')
-rw-r--r--src/user/lib/elfload.c6
-rw-r--r--src/user/lib/esemaphore.c4
-rw-r--r--src/user/lib/esemaphore.h2
-rw-r--r--src/user/lib/fs/misc.c4
-rw-r--r--src/user/lib/malloc.c4
-rw-r--r--src/user/lib/stdlib.c2
-rw-r--r--src/user/lib/stdlib.h2
-rw-r--r--src/user/lib/syscall.c2
-rw-r--r--src/user/lib/syscall.c.awk2
9 files changed, 14 insertions, 14 deletions
diff --git a/src/user/lib/elfload.c b/src/user/lib/elfload.c
index ef14388..45ce2a0 100644
--- a/src/user/lib/elfload.c
+++ b/src/user/lib/elfload.c
@@ -1,6 +1,6 @@
-#include <shared/execbuf.h>
-#include <shared/flags.h>
-#include <shared/syscalls.h>
+#include <camellia/execbuf.h>
+#include <camellia/flags.h>
+#include <camellia/syscalls.h>
#include <user/lib/elf.h>
#include <user/lib/elfload.h>
diff --git a/src/user/lib/esemaphore.c b/src/user/lib/esemaphore.c
index 1230274..1da418e 100644
--- a/src/user/lib/esemaphore.c
+++ b/src/user/lib/esemaphore.c
@@ -1,5 +1,5 @@
-#include <shared/flags.h>
-#include <shared/syscalls.h>
+#include <camellia/flags.h>
+#include <camellia/syscalls.h>
#include <user/lib/esemaphore.h>
#include <user/lib/stdlib.h>
diff --git a/src/user/lib/esemaphore.h b/src/user/lib/esemaphore.h
index e746bd7..4a16c2e 100644
--- a/src/user/lib/esemaphore.h
+++ b/src/user/lib/esemaphore.h
@@ -1,5 +1,5 @@
#pragma once
-#include <shared/types.h>
+#include <camellia/types.h>
struct evil_sem {
handle_t wait, signal;
diff --git a/src/user/lib/fs/misc.c b/src/user/lib/fs/misc.c
index 3631e35..99993ed 100644
--- a/src/user/lib/fs/misc.c
+++ b/src/user/lib/fs/misc.c
@@ -1,6 +1,6 @@
-#include <shared/flags.h>
+#include <camellia/flags.h>
+#include <camellia/syscalls.h>
#include <shared/mem.h>
-#include <shared/syscalls.h>
#include <stdbool.h>
#include <user/lib/fs/misc.h>
#include <user/lib/stdlib.h>
diff --git a/src/user/lib/malloc.c b/src/user/lib/malloc.c
index 40ae917..bb6b653 100644
--- a/src/user/lib/malloc.c
+++ b/src/user/lib/malloc.c
@@ -1,5 +1,5 @@
-#include <shared/flags.h>
-#include <shared/syscalls.h>
+#include <camellia/flags.h>
+#include <camellia/syscalls.h>
#include <stdbool.h>
#include <user/lib/malloc.h>
diff --git a/src/user/lib/stdlib.c b/src/user/lib/stdlib.c
index e947486..943af01 100644
--- a/src/user/lib/stdlib.c
+++ b/src/user/lib/stdlib.c
@@ -1,5 +1,5 @@
+#include <camellia/syscalls.h>
#include <shared/printf.h>
-#include <shared/syscalls.h>
#include <user/lib/stdlib.h>
// TODO oh god this garbage - malloc, actually open, [...]
diff --git a/src/user/lib/stdlib.h b/src/user/lib/stdlib.h
index 1982e85..64fbbe6 100644
--- a/src/user/lib/stdlib.h
+++ b/src/user/lib/stdlib.h
@@ -1,6 +1,6 @@
#pragma once
+#include <camellia/types.h>
#include <shared/mem.h>
-#include <shared/types.h>
#include <stdbool.h>
#include <stddef.h>
#include <user/lib/malloc.h>
diff --git a/src/user/lib/syscall.c b/src/user/lib/syscall.c
index e105638..7e0de88 100644
--- a/src/user/lib/syscall.c
+++ b/src/user/lib/syscall.c
@@ -2,7 +2,7 @@
* don't modify manually, instead run:
* make src/user/lib/syscall.c
*/
-#include <shared/syscalls.h>
+#include <camellia/syscalls.h>
_Noreturn void _syscall_exit(long ret) {
diff --git a/src/user/lib/syscall.c.awk b/src/user/lib/syscall.c.awk
index 91e4665..58f9a4c 100644
--- a/src/user/lib/syscall.c.awk
+++ b/src/user/lib/syscall.c.awk
@@ -4,7 +4,7 @@ BEGIN {
* don't modify manually, instead run:\n\
* make src/user/lib/syscall.c\n\
*/\n\
-#include <shared/syscalls.h>\n\
+#include <camellia/syscalls.h>\n\
\n";
}