Răsfoiți Sursa

[libc] Add HAVE_SYS_SELECT_H/HAVE_SYS_SOCKET_H options.

Bernard Xiong 7 ani în urmă
părinte
comite
9bd094197e

+ 14 - 0
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

+ 6 - 0
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')

+ 0 - 0
components/dfs/filesystems/net/sys/select.h → components/dfs/filesystems/net/select/sys/select.h


+ 0 - 0
components/dfs/filesystems/net/sys/socket.h → components/dfs/filesystems/net/socket/sys/socket.h