diff options
| author | MurphyZhao <[email protected]> | 2018-11-02 10:23:29 +0800 |
|---|---|---|
| committer | MurphyZhao <[email protected]> | 2018-11-02 10:26:37 +0800 |
| commit | c3cc7a29c8e8da3fa897a8ff95d6248c2a0fc3f7 (patch) | |
| tree | 67d2d205b742961b92c054c85e90631c81ffe28a /components/dfs/include | |
| parent | 58a6b51236498de0bf8cbdb6ee7b172ebc442314 (diff) | |
[components][dfs] 移除冗余代码
[components][net] 修复 Kconfig
[components][net][sal] 还原对 SAL 框架的修改，在 proto_ops 结构体实例赋值位置修改
Signed-off-by: MurphyZhao <[email protected]>
Diffstat (limited to 'components/dfs/include')
| -rw-r--r-- | components/dfs/include/dfs_poll.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/components/dfs/include/dfs_poll.h b/components/dfs/include/dfs_poll.h index 066363d6fc..d9597a4364 100644 --- a/components/dfs/include/dfs_poll.h +++ b/components/dfs/include/dfs_poll.h @@ -29,8 +29,6 @@ #define POLLHUP (0x08) #define POLLNVAL (0x10) -#define POLLMASK_DEFAULT (POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM) - typedef unsigned int nfds_t; struct pollfd @@ -39,12 +37,10 @@ struct pollfd short events; short revents; }; +#endif /* !defined(POLLIN) && !defined(POLLOUT) */ -int poll(struct pollfd *fds, nfds_t nfds, int timeout); -#else /* !defined(POLLIN) && !defined(POLLOUT) */ #define POLLMASK_DEFAULT (POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM) int poll(struct pollfd *fds, nfds_t nfds, int timeout); -#endif /* !defined(POLLIN) && !defined(POLLOUT) */ #endif /* RT_USING_POSIX */ #endif /* DFS_POLL_H__ */ |