From b5cd18739a64c8d923a55b61c89ae3900faafd84 Mon Sep 17 00:00:00 2001
From: Kacper <kacper@mail.openlinux.dev>
Date: Tue, 9 Dec 2025 21:17:12 +0100
Subject: Fix include paths and formatting inconsistencies

---
 lib/libc/include/__stdio.h | 36 ++++++++++++++++++++++++++++++++++++
 lib/libc/include/io.h      | 36 ------------------------------------
 lib/libc/include/libc.h    |  5 +++++
 3 files changed, 41 insertions(+), 36 deletions(-)
 create mode 100644 lib/libc/include/__stdio.h
 delete mode 100644 lib/libc/include/io.h

(limited to 'lib/libc/include')

diff --git a/lib/libc/include/__stdio.h b/lib/libc/include/__stdio.h
new file mode 100644
index 00000000..ebda4b22
--- /dev/null
+++ b/lib/libc/include/__stdio.h
@@ -0,0 +1,36 @@
+#ifndef __LIBC_IO
+#define __LIBC_IO
+
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdint.h>
+#include <sys/types.h>
+#include <stdatomic.h>
+
+typedef __SIZE_TYPE__ size_t;
+
+#define _IO_ERR	 0x4
+#define _IO_EOF	 0x8
+#define _IO_WIDE 0x10
+
+struct __FILE {
+	int fd;
+	uint32_t flags;
+	int type;
+	pid_t pid;
+	atomic_flag lock;
+	char *buf;
+	int eof;
+	size_t buf_size;
+	size_t buf_pos;
+	size_t buf_len;
+	unsigned char unget_buf[16];
+	size_t unget_cnt;
+	off_t offset;
+	struct __FILE *next;
+};
+
+void __libc_fadd(struct __FILE *f);
+
+#endif
diff --git a/lib/libc/include/io.h b/lib/libc/include/io.h
deleted file mode 100644
index ebda4b22..00000000
--- a/lib/libc/include/io.h
+++ /dev/null
@@ -1,36 +0,0 @@
-#ifndef __LIBC_IO
-#define __LIBC_IO
-
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdint.h>
-#include <sys/types.h>
-#include <stdatomic.h>
-
-typedef __SIZE_TYPE__ size_t;
-
-#define _IO_ERR	 0x4
-#define _IO_EOF	 0x8
-#define _IO_WIDE 0x10
-
-struct __FILE {
-	int fd;
-	uint32_t flags;
-	int type;
-	pid_t pid;
-	atomic_flag lock;
-	char *buf;
-	int eof;
-	size_t buf_size;
-	size_t buf_pos;
-	size_t buf_len;
-	unsigned char unget_buf[16];
-	size_t unget_cnt;
-	off_t offset;
-	struct __FILE *next;
-};
-
-void __libc_fadd(struct __FILE *f);
-
-#endif
diff --git a/lib/libc/include/libc.h b/lib/libc/include/libc.h
index 7faee4b7..6651feaa 100644
--- a/lib/libc/include/libc.h
+++ b/lib/libc/include/libc.h
@@ -4,6 +4,11 @@
 #include <stdatomic.h>
 #include <features.h>
 
+#include <__stdio.h>
+#include <thread.h>
+
+#define __IMPL(_v) ((__##typeof(_v))_v)
+
 #define likely(x)     __builtin_expect(!!(x), 1)
 #define unlikely(x)   __builtin_expect(!!(x), 0)
 #define __unused      __attribute__((unused))
-- 
cgit v1.2.3