shared: move some headers from shared/ to camellia/

23 files changed, 37 insertions, 37 deletions

diff --git a/src/user/app/init/driver/ansiterm.c b/src/user/app/init/driver/ansiterm.c
index 8206e85..dde2183 100644
--- a/src/user/app/init/driver/ansiterm.c
+++ b/src/user/app/init/driver/ansiterm.c
@@ -1,4 +1,4 @@
-#include <shared/syscalls.h>
+#include <camellia/syscalls.h>
 #include <stdbool.h>
 #include <user/app/init/driver/driver.h>
 
diff --git a/src/user/app/init/driver/ps2.c b/src/user/app/init/driver/ps2.c
index 9bbab8e..45458c8 100644
--- a/src/user/app/init/driver/ps2.c
+++ b/src/user/app/init/driver/ps2.c
@@ -1,5 +1,5 @@
+#include <camellia/syscalls.h>
 #include <shared/container/ring.h>
-#include <shared/syscalls.h>
 #include <stdbool.h>
 #include <user/app/init/driver/driver.h>
 
diff --git a/src/user/app/init/driver/termcook.c b/src/user/app/init/driver/termcook.c
index 2ddd3f9..868d5d3 100644
--- a/src/user/app/init/driver/termcook.c
+++ b/src/user/app/init/driver/termcook.c
@@ -1,4 +1,4 @@
-#include <shared/syscalls.h>
+#include <camellia/syscalls.h>
 #include <user/app/init/driver/driver.h>
 #include <user/lib/stdlib.h>
 
diff --git a/src/user/app/init/driver/tmpfs.c b/src/user/app/init/driver/tmpfs.c
index c6cc0f3..200e62d 100644
--- a/src/user/app/init/driver/tmpfs.c
+++ b/src/user/app/init/driver/tmpfs.c
@@ -1,5 +1,5 @@
+#include <camellia/syscalls.h>
 #include <shared/mem.h>
-#include <shared/syscalls.h>
 #include <stddef.h>
 #include <user/lib/malloc.h>
 
diff --git a/src/user/app/init/main.c b/src/user/app/init/main.c
index 4c4bf4e..772a9e3 100644
--- a/src/user/app/init/main.c
+++ b/src/user/app/init/main.c
@@ -1,5 +1,5 @@
-#include <shared/flags.h>
-#include <shared/syscalls.h>
+#include <camellia/flags.h>
+#include <camellia/syscalls.h>
 #include <stdint.h>
 #include <user/app/init/driver/driver.h>
 #include <user/app/init/shell.h>
diff --git a/src/user/app/init/shell.c b/src/user/app/init/shell.c
index f420208..76a0dbc 100644
--- a/src/user/app/init/shell.c
+++ b/src/user/app/init/shell.c
@@ -1,4 +1,4 @@
-#include <shared/syscalls.h>
+#include <camellia/syscalls.h>
 #include <stdbool.h>
 #include <user/app/init/shell.h>
 #include <user/app/init/tests/main.h>
diff --git a/src/user/app/init/tests/main.c b/src/user/app/init/tests/main.c
index 015a3be..4f8e858 100644
--- a/src/user/app/init/tests/main.c
+++ b/src/user/app/init/tests/main.c
@@ -1,8 +1,8 @@
 #define TEST_MACROS
-#include <shared/errno.h>
-#include <shared/execbuf.h>
-#include <shared/flags.h>
-#include <shared/syscalls.h>
+#include <camellia/errno.h>
+#include <camellia/execbuf.h>
+#include <camellia/flags.h>
+#include <camellia/syscalls.h>
 #include <user/app/init/tests/main.h>
 #include <user/lib/stdlib.h>
 
diff --git a/src/user/app/init/tests/pipe.c b/src/user/app/init/tests/pipe.c
index 54025d0..227007a 100644
--- a/src/user/app/init/tests/pipe.c
+++ b/src/user/app/init/tests/pipe.c
@@ -1,6 +1,6 @@
 #define TEST_MACROS
-#include <shared/flags.h>
-#include <shared/syscalls.h>
+#include <camellia/flags.h>
+#include <camellia/syscalls.h>
 #include <user/app/init/tests/main.h>
 #include <user/lib/stdlib.h>
 
diff --git a/src/user/app/init/tests/semaphore.c b/src/user/app/init/tests/semaphore.c
index 66ea4ba..b55db9e 100644
--- a/src/user/app/init/tests/semaphore.c
+++ b/src/user/app/init/tests/semaphore.c
@@ -1,6 +1,6 @@
 #define TEST_MACROS
-#include <shared/flags.h>
-#include <shared/syscalls.h>
+#include <camellia/flags.h>
+#include <camellia/syscalls.h>
 #include <user/app/init/tests/main.h>
 #include <user/lib/esemaphore.h>
 #include <user/lib/stdlib.h>
diff --git a/src/user/app/init/tests/stress.c b/src/user/app/init/tests/stress.c
index 9af1706..f797611 100644
--- a/src/user/app/init/tests/stress.c
+++ b/src/user/app/init/tests/stress.c
@@ -1,6 +1,6 @@
 #define TEST_MACROS
-#include <shared/flags.h>
-#include <shared/syscalls.h>
+#include <camellia/flags.h>
+#include <camellia/syscalls.h>
 #include <user/app/init/tests/main.h>
 #include <user/lib/stdlib.h>
 
diff --git a/src/user/app/testelf/main.c b/src/user/app/testelf/main.c
index a80d233..8c5b6a4 100644
--- a/src/user/app/testelf/main.c
+++ b/src/user/app/testelf/main.c
@@ -1,5 +1,5 @@
+#include <camellia/syscalls.h>
 #include <shared/printf.h>
-#include <shared/syscalls.h>
 #include <user/lib/elf.h>
 #include <user/lib/elfload.h>
 #include <user/lib/stdlib.h>
diff --git a/src/user/bootstrap/main.c b/src/user/bootstrap/main.c
index 5f36aa1..fecd38f 100644
--- a/src/user/bootstrap/main.c
+++ b/src/user/bootstrap/main.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 <user/lib/elfload.h>
 #include <user/lib/fs/misc.h>
 
diff --git a/src/user/bootstrap/tar.c b/src/user/bootstrap/tar.c
index 40da437..a392f4c 100644
--- a/src/user/bootstrap/tar.c
+++ b/src/user/bootstrap/tar.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 <stdint.h>
 
 #include "tar.h"
diff --git a/src/user/bootstrap/tar.h b/src/user/bootstrap/tar.h
index 43aa9ed..fe4d6c5 100644
--- a/src/user/bootstrap/tar.h
+++ b/src/user/bootstrap/tar.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <shared/types.h>
+#include <camellia/types.h>
 
 _Noreturn void tar_driver(void *base);
 void *tar_find(const char *path, size_t path_len, void *base, size_t base_len);
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";
 }