From 26f81e50066e5bb7aeae218094e0f834c405a8c1 Mon Sep 17 00:00:00 2001
From: Ada Christine <adachristine18@gmail.com>
Date: Wed, 23 Mar 2022 00:45:57 +0000
Subject: fix collision with /usr/include/efi/lib.h

squash me
---
 lib/kstdio.h    |  2 +-
 lib/lib.h       | 14 --------------
 lib/sophialib.h | 14 ++++++++++++++
 lib/string.c    |  2 +-
 4 files changed, 16 insertions(+), 16 deletions(-)
 delete mode 100644 lib/lib.h
 create mode 100644 lib/sophialib.h

(limited to 'lib')

diff --git a/lib/kstdio.h b/lib/kstdio.h
index 79ed357..d3615f1 100644
--- a/lib/kstdio.h
+++ b/lib/kstdio.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <lib.h>
+#include <sophialib.h>
 
 #include <stdarg.h>
 
diff --git a/lib/lib.h b/lib/lib.h
deleted file mode 100644
index c28e17c..0000000
--- a/lib/lib.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#pragma once
-
-#include <stddef.h>
-
-void *memcpy(void *dest, const void *src, size_t size);
-void *memmove(void *dest, const void *src, size_t size);
-void *memset(void *dest, int val, size_t size);
-int memcmp(const void *str1, const void *str2, size_t count);
-size_t strlen(const char *s);
-unsigned long long strtoull(
-        const char *restrict begin,
-        char **restrict end,
-        int base);
-
diff --git a/lib/sophialib.h b/lib/sophialib.h
new file mode 100644
index 0000000..c28e17c
--- /dev/null
+++ b/lib/sophialib.h
@@ -0,0 +1,14 @@
+#pragma once
+
+#include <stddef.h>
+
+void *memcpy(void *dest, const void *src, size_t size);
+void *memmove(void *dest, const void *src, size_t size);
+void *memset(void *dest, int val, size_t size);
+int memcmp(const void *str1, const void *str2, size_t count);
+size_t strlen(const char *s);
+unsigned long long strtoull(
+        const char *restrict begin,
+        char **restrict end,
+        int base);
+
diff --git a/lib/string.c b/lib/string.c
index c4764ce..3d3f4a1 100644
--- a/lib/string.c
+++ b/lib/string.c
@@ -1,4 +1,4 @@
-#include <lib.h>
+#include <sophialib.h>
 
 size_t strlen(const char *s)
 {
-- 
cgit v1.3.1-1-g115d