From 8834571b202cf4dc9c649cfb096c213b6ecf1566 Mon Sep 17 00:00:00 2001
From: Kacper <kacper@mail.openlinux.dev>
Date: Thu, 25 Dec 2025 15:13:54 +0100
Subject: Move __dirent.h to libc/dirent.h

---
 lib/libc/internal/deinit/deinit.c             |  6 ++++++
 lib/libc/internal/deinit/tls.c                |  2 +-
 lib/libc/internal/include/__dirent.h          | 24 ------------------------
 lib/libc/internal/include/internal/io_uring.h |  6 ------
 lib/libc/internal/include/libc/dirent.h       | 20 +++++++++++++++++++-
 5 files changed, 26 insertions(+), 32 deletions(-)
 create mode 100644 lib/libc/internal/deinit/deinit.c
 delete mode 100644 lib/libc/internal/include/__dirent.h
 delete mode 100644 lib/libc/internal/include/internal/io_uring.h

(limited to 'lib/libc/internal')

diff --git a/lib/libc/internal/deinit/deinit.c b/lib/libc/internal/deinit/deinit.c
new file mode 100644
index 00000000..e89e6a0c
--- /dev/null
+++ b/lib/libc/internal/deinit/deinit.c
@@ -0,0 +1,6 @@
+extern void __libc_deinit_tls();
+
+void __libc_deinit(void)
+{
+	__libc_deinit_tls();
+}
diff --git a/lib/libc/internal/deinit/tls.c b/lib/libc/internal/deinit/tls.c
index 438f0122..0eb78aeb 100644
--- a/lib/libc/internal/deinit/tls.c
+++ b/lib/libc/internal/deinit/tls.c
@@ -1,7 +1,7 @@
 #include <libc.h>
 #include <sys/mman.h>
 
-void __deinit_tls(void)
+void __libc_deinit_tls(void)
 {
 	int r;
 
diff --git a/lib/libc/internal/include/__dirent.h b/lib/libc/internal/include/__dirent.h
deleted file mode 100644
index 4f9ead80..00000000
--- a/lib/libc/internal/include/__dirent.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#ifndef __LIBC_DIRENT_H
-#define __LIBC_DIRENT_H
-
-#include <stdint.h>
-#include <stdio.h>
-#include <sys/types.h>
-
-struct linux_dirent64 {
-	uint64_t d_ino;
-	int64_t d_off;
-	unsigned short d_reclen;
-	unsigned char d_type;
-	char d_name[];
-};
-
-struct __DIR {
-	int fildes;
-	int cached;
-	off_t tell;
-	off_t offset;
-	char buffer[BUFSIZ] __attribute__((__aligned__(8)));
-};
-
-#endif
diff --git a/lib/libc/internal/include/internal/io_uring.h b/lib/libc/internal/include/internal/io_uring.h
deleted file mode 100644
index e7369146..00000000
--- a/lib/libc/internal/include/internal/io_uring.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __INTERNAL_IO_URING_H
-#define __INTERNAL_IO_URING_H
-
-void __io_uring_init(void);
-
-#endif
diff --git a/lib/libc/internal/include/libc/dirent.h b/lib/libc/internal/include/libc/dirent.h
index 296cc91e..4f9ead80 100644
--- a/lib/libc/internal/include/libc/dirent.h
+++ b/lib/libc/internal/include/libc/dirent.h
@@ -1,6 +1,24 @@
 #ifndef __LIBC_DIRENT_H
 #define __LIBC_DIRENT_H
 
-struct __DIR {};
+#include <stdint.h>
+#include <stdio.h>
+#include <sys/types.h>
+
+struct linux_dirent64 {
+	uint64_t d_ino;
+	int64_t d_off;
+	unsigned short d_reclen;
+	unsigned char d_type;
+	char d_name[];
+};
+
+struct __DIR {
+	int fildes;
+	int cached;
+	off_t tell;
+	off_t offset;
+	char buffer[BUFSIZ] __attribute__((__aligned__(8)));
+};
 
 #endif
-- 
cgit v1.2.3