From 9bd094197e8dcc04a72db283cf46cd71bab2fede Mon Sep 17 00:00:00 2001
From: Bernard Xiong <bernard.xiong@gmail.com>
Date: Sun, 5 Nov 2017 14:36:48 +0800
Subject: [PATCH] [libc] Add HAVE_SYS_SELECT_H/HAVE_SYS_SOCKET_H options.

---
 components/dfs/KConfig                             | 14 ++++++++++++++
 components/dfs/filesystems/net/SConscript          |  6 ++++++
 .../dfs/filesystems/net/{ => select}/sys/select.h  |  0
 .../dfs/filesystems/net/{ => socket}/sys/socket.h  |  0
 4 files changed, 20 insertions(+)
 rename components/dfs/filesystems/net/{ => select}/sys/select.h (100%)
 rename components/dfs/filesystems/net/{ => socket}/sys/socket.h (100%)

diff --git a/components/dfs/KConfig b/components/dfs/KConfig
index 97379b3e4..e7dfb2abb 100644
--- a/components/dfs/KConfig
+++ b/components/dfs/KConfig
@@ -96,6 +96,20 @@ if RT_USING_DFS
         help
             Let BSD socket operated by file system API, such as read/write and involveed in select/poll POSIX APIs.
 
+    if RT_USING_DFS_NET
+        config HAVE_SYS_SELECT_H
+            bool "Toolchains/libc have provide sys/select.h"
+            default n
+            help
+                Toolchains/libc have provide sys/select.h file, therefore, disable the sys/select.h in RT-Thread.
+
+        config HAVE_SYS_SOCKET_H
+            bool "Toolchains/libc have provide sys/socket.h"
+            default n
+            help
+                Toolchains/libc have provide sys/socket.h file, therefore, disable the sys/socket.h in RT-Thread.
+    endif
+
     config RT_USING_DFS_ROMFS
         bool "Enable ReadOnly file system on flash"
         default n
diff --git a/components/dfs/filesystems/net/SConscript b/components/dfs/filesystems/net/SConscript
index 810ca16fe..0b5e45c09 100644
--- a/components/dfs/filesystems/net/SConscript
+++ b/components/dfs/filesystems/net/SConscript
@@ -6,6 +6,12 @@ cwd = GetCurrentDir()
 src = Glob('*.c')
 CPPPATH = [cwd]
 
+if not GetDepend('HAVE_SYS_SELECT_H'):
+    CPPPATH += [cwd + '/select']
+
+if not GetDepend('HAVE_SYS_SOCKET_H'):
+    CPPPATH += [cwd + '/socket']
+
 group = DefineGroup('Filesystem', src, depend = ['RT_USING_DFS', 'RT_USING_DFS_NET'], CPPPATH = CPPPATH)
 
 Return('group')
diff --git a/components/dfs/filesystems/net/sys/select.h b/components/dfs/filesystems/net/select/sys/select.h
similarity index 100%
rename from components/dfs/filesystems/net/sys/select.h
rename to components/dfs/filesystems/net/select/sys/select.h
diff --git a/components/dfs/filesystems/net/sys/socket.h b/components/dfs/filesystems/net/socket/sys/socket.h
similarity index 100%
rename from components/dfs/filesystems/net/sys/socket.h
rename to components/dfs/filesystems/net/socket/sys/socket.h
-- 
GitLab