From 83e95bdff4c48c661b50e1eec56d5fd293b28fbb Mon Sep 17 00:00:00 2001
From: Shell <smokewood@qq.com>
Date: Thu, 28 Mar 2024 23:42:56 +0800
Subject: sync smart & dfs (#8672)

Signed-off-by: xqyjlj <xqyjlj@126.com>
Signed-off-by: Shell <smokewood@qq.com>
Co-authored-by: xqyjlj <xqyjlj@126.com>
---
 components/libc/compilers/common/include/dirent.h     | 6 +++++-
 components/libc/compilers/common/include/sys/ioctl.h  | 7 ++++---
 components/libc/compilers/common/include/sys/unistd.h | 2 ++
 3 files changed, 11 insertions(+), 4 deletions(-)

(limited to 'components/libc/compilers/common/include')

diff --git a/components/libc/compilers/common/include/dirent.h b/components/libc/compilers/common/include/dirent.h
index f1a45d2986..51451e2d59 100644
--- a/components/libc/compilers/common/include/dirent.h
+++ b/components/libc/compilers/common/include/dirent.h
@@ -32,9 +32,13 @@ extern "C" {
 
 #define DT_UNKNOWN      0x00
 #define DT_FIFO         0x01
-#define DT_SYMLINK      0x03
+#define DT_CHR          0x02
 #define DT_DIR          0x04
+#define DT_BLK          0x06
 #define DT_REG          0x08
+#define DT_LNK          0x0a
+#define DT_SOCK         0x0c
+#define DT_SYMLINK      DT_LNK
 
 #ifndef HAVE_DIR_STRUCTURE
 #define HAVE_DIR_STRUCTURE
diff --git a/components/libc/compilers/common/include/sys/ioctl.h b/components/libc/compilers/common/include/sys/ioctl.h
index ab0c069550..908074863a 100644
--- a/components/libc/compilers/common/include/sys/ioctl.h
+++ b/components/libc/compilers/common/include/sys/ioctl.h
@@ -15,6 +15,10 @@
 extern "C" {
 #endif
 
+#ifdef RT_USING_MUSLLIBC
+#include_next <sys/ioctl.h>
+#else
+
 struct winsize
 {
     unsigned short ws_row;
@@ -23,9 +27,6 @@ struct winsize
     unsigned short ws_ypixel;
 };
 
-#ifdef RT_USING_MUSLLIBC
-#include <bits/ioctl.h>
-#else
 /*
  * Direction bits, which any architecture can choose to override
  * before including this file.
diff --git a/components/libc/compilers/common/include/sys/unistd.h b/components/libc/compilers/common/include/sys/unistd.h
index b9c64f3bb6..824891d57e 100644
--- a/components/libc/compilers/common/include/sys/unistd.h
+++ b/components/libc/compilers/common/include/sys/unistd.h
@@ -19,6 +19,8 @@
 extern "C" {
 #endif
 
+#define _POSIX_VDISABLE 0
+
 #define STDIN_FILENO    0       /* standard input file descriptor */
 #define STDOUT_FILENO   1       /* standard output file descriptor */
 #define STDERR_FILENO   2       /* standard error file descriptor */
-- 
cgit v1.3.1