diff options
| author | guo <[email protected]> | 2021-09-13 10:45:09 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-09-13 10:45:09 +0800 |
| commit | 160d448660f183cbc9d1a9936d3dada536ac172b (patch) | |
| tree | 206f9210cfed26146759b6d66fac927a2d8dfdba /components/dfs | |
| parent | 38baf89da4662c673dc81a31238639b52334f5dd (diff) | |
| parent | c360688714d3aaf1f2114c45afaa3ee2ddc64fdd (diff) | |
Merge pull request #5051 from mysterywolf/be_libc
[libc标准化] 使用标准poll.h代替dfs_poll.h
Diffstat (limited to 'components/dfs')
| -rw-r--r-- | components/dfs/SConscript | 2 | ||||
| -rw-r--r-- | components/dfs/include/dfs_poll.h | 33 | ||||
| -rw-r--r-- | components/dfs/src/dfs_poll.c (renamed from components/dfs/src/poll.c) | 2 | ||||
| -rw-r--r-- | components/dfs/src/dfs_select.c (renamed from components/dfs/src/select.c) | 2 |
4 files changed, 4 insertions, 35 deletions
diff --git a/components/dfs/SConscript b/components/dfs/SConscript index 3ccaeb1080..e449c84911 100644 --- a/components/dfs/SConscript +++ b/components/dfs/SConscript @@ -11,7 +11,7 @@ cwd = GetCurrentDir() CPPPATH = [cwd + "/include"] if GetDepend('RT_USING_POSIX'): - src += ['src/poll.c', 'src/select.c'] + src += ['src/dfs_poll.c', 'src/dfs_select.c'] group = DefineGroup('Filesystem', src, depend = ['RT_USING_DFS'], CPPPATH = CPPPATH) diff --git a/components/dfs/include/dfs_poll.h b/components/dfs/include/dfs_poll.h index 096a5fe712..11d17cc1ff 100644 --- a/components/dfs/include/dfs_poll.h +++ b/components/dfs/include/dfs_poll.h @@ -10,37 +10,6 @@ #ifndef DFS_POLL_H__ #define DFS_POLL_H__ -#include <rtthread.h> - -#ifdef RT_USING_POSIX -#include <sys/time.h> /* for struct timeval */ - -#if !defined(POLLIN) && !defined(POLLOUT) -#define POLLIN (0x01) -#define POLLRDNORM (0x01) -#define POLLRDBAND (0x01) -#define POLLPRI (0x01) - -#define POLLOUT (0x02) -#define POLLWRNORM (0x02) -#define POLLWRBAND (0x02) - -#define POLLERR (0x04) -#define POLLHUP (0x08) -#define POLLNVAL (0x10) - -typedef unsigned int nfds_t; - -struct pollfd -{ - int fd; - short events; - short revents; -}; -#endif /* !defined(POLLIN) && !defined(POLLOUT) */ - -#define POLLMASK_DEFAULT (POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM) -int poll(struct pollfd *fds, nfds_t nfds, int timeout); -#endif /* RT_USING_POSIX */ +#include <poll.h> #endif /* DFS_POLL_H__ */ diff --git a/components/dfs/src/poll.c b/components/dfs/src/dfs_poll.c index d1e0372494..607b3487be 100644 --- a/components/dfs/src/poll.c +++ b/components/dfs/src/dfs_poll.c @@ -17,7 +17,7 @@ #include <dfs.h> #include <dfs_file.h> #include <dfs_posix.h> -#include <dfs_poll.h> +#include <poll.h> #ifdef RT_USING_POSIX diff --git a/components/dfs/src/select.c b/components/dfs/src/dfs_select.c index c9286ca97f..ca9c549259 100644 --- a/components/dfs/src/select.c +++ b/components/dfs/src/dfs_select.c @@ -11,7 +11,7 @@ #include <dfs_fs.h> #include <dfs_posix.h> -#include <dfs_poll.h> +#include <poll.h> #include <dfs_select.h> #ifdef RT_USING_POSIX |