From c3cc7a29c8e8da3fa897a8ff95d6248c2a0fc3f7 Mon Sep 17 00:00:00 2001 From: MurphyZhao Date: Fri, 2 Nov 2018 10:23:29 +0800 Subject: [components][dfs] 移除冗余代码 [components][net] 修复 Kconfig [components][net][sal] 还原对 SAL 框架的修改，在 proto_ops 结构体实例赋值位置修改 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: MurphyZhao --- components/dfs/include/dfs_poll.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'components/dfs') 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__ */ -- cgit v1.3.1