diff options
| author | Meco Man <[email protected]> | 2021-09-22 16:45:21 -0400 |
|---|---|---|
| committer | Meco Man <[email protected]> | 2021-09-22 16:45:21 -0400 |
| commit | ee4b7916a35cff4c97103fe631a2eba7eccd69ac (patch) | |
| tree | 05e72441d3fe1e412e681b3baca5091661ecc3eb | |
| parent | 894171952e180f4069f75af34c53a8a732900999 (diff) | |
[libc标准化]脱敏dfs_select.h 由标准sys/select.h代替
| -rw-r--r-- | components/dfs/src/dfs_select.c | 2 | ||||
| -rw-r--r-- | components/lwp/lwp_syscall.c | 2 | ||||
| -rw-r--r-- | components/net/sal_socket/SConscript | 3 | ||||
| -rw-r--r-- | components/net/sal_socket/include/dfs_net/sys_select/sys/select.h | 16 | ||||
| -rw-r--r-- | examples/libc/termios_test.c | 2 | ||||
| -rw-r--r-- | examples/rt-link/rtlink_dev_example.c | 2 |
6 files changed, 4 insertions, 23 deletions
diff --git a/components/dfs/src/dfs_select.c b/components/dfs/src/dfs_select.c index ca9c549259..795b816354 100644 --- a/components/dfs/src/dfs_select.c +++ b/components/dfs/src/dfs_select.c @@ -12,7 +12,7 @@ #include <dfs_posix.h> #include <poll.h> -#include <dfs_select.h> +#include <sys/select.h> #ifdef RT_USING_POSIX diff --git a/components/lwp/lwp_syscall.c b/components/lwp/lwp_syscall.c index d9112eed3e..f9bc84ea97 100644 --- a/components/lwp/lwp_syscall.c +++ b/components/lwp/lwp_syscall.c @@ -14,7 +14,7 @@ #include <lwp_syscall.h> #include <poll.h> -#include <dfs_select.h> +#include <sys/select.h> #if (defined(RT_USING_SAL) && defined(SAL_USING_POSIX)) #include <sys/socket.h> diff --git a/components/net/sal_socket/SConscript b/components/net/sal_socket/SConscript index cc7634f7d9..3903dce89a 100644 --- a/components/net/sal_socket/SConscript +++ b/components/net/sal_socket/SConscript @@ -26,9 +26,6 @@ if GetDepend('SAL_USING_POSIX'): CPPPATH += [cwd + '/include/dfs_net'] src += Glob('socket/net_sockets.c') src += Glob('dfs_net/*.c') - - if not GetDepend('HAVE_SYS_SELECT_H'): - CPPPATH += [cwd + '/include/dfs_net/sys_select'] if not GetDepend('HAVE_SYS_SOCKET_H'): CPPPATH += [cwd + '/include/socket/sys_socket'] diff --git a/components/net/sal_socket/include/dfs_net/sys_select/sys/select.h b/components/net/sal_socket/include/dfs_net/sys_select/sys/select.h deleted file mode 100644 index f174bc6504..0000000000 --- a/components/net/sal_socket/include/dfs_net/sys_select/sys/select.h +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Copyright (c) 2006-2021, RT-Thread Development Team - * - * SPDX-License-Identifier: Apache-2.0 - * - * Change Logs: - * Date Author Notes - * 2015-05-02 Bernard First version - */ - -#ifndef SELECT_H__ -#define SELECT_H__ - -#include <dfs_select.h> - -#endif diff --git a/examples/libc/termios_test.c b/examples/libc/termios_test.c index f3a6ce3a1c..855bc82b96 100644 --- a/examples/libc/termios_test.c +++ b/examples/libc/termios_test.c @@ -16,7 +16,7 @@ #if defined (RT_USING_POSIX) #include <dfs_posix.h> - #include <dfs_select.h> + #include <sys/select.h> #if defined (RT_USING_POSIX_TERMIOS) #include <termios.h> #else diff --git a/examples/rt-link/rtlink_dev_example.c b/examples/rt-link/rtlink_dev_example.c index d00f916efd..523b67ba53 100644 --- a/examples/rt-link/rtlink_dev_example.c +++ b/examples/rt-link/rtlink_dev_example.c @@ -48,7 +48,7 @@ static rt_err_t rtlink_dev_tx_done(rt_device_t dev, void *buffer) #ifdef RT_USING_POSIX #include <dfs_posix.h> #include <poll.h> -#include <dfs_select.h> +#include <sys/select.h> #define RTLINK01_PATH "/dev/rtlink01" int fd = -1; |