Kouhei Sutou
null+****@clear*****
Thu May 11 14:25:10 JST 2017
Kouhei Sutou 2017-05-11 14:25:10 +0900 (Thu, 11 May 2017) New Revision: a6697d13132638343cb026d33fe0c88de6585753 https://github.com/groonga/groonga/commit/a6697d13132638343cb026d33fe0c88de6585753 Message: Use poll.h instead of sys/poll.h Poll man page on Linux, FreeBSD, OpenBSD and Solaris uses <poll.h> not <sys/poll.h>. So poll.h will be portable. Modified files: CMakeLists.txt configure.ac lib/grn_com.h Modified: CMakeLists.txt (+1 -1) =================================================================== --- CMakeLists.txt 2017-05-10 19:03:46 +0900 (2a07309) +++ CMakeLists.txt 2017-05-11 14:25:10 +0900 (18e7fe9) @@ -333,7 +333,7 @@ else() endif() if(NOT USE_KQUEUE) - ac_check_headers(sys/poll.h) + ac_check_headers(poll.h) if(${HAVE_SYS_POLL_H}) ac_check_funcs(poll) if(${HAVE_POLL}) Modified: configure.ac (+1 -1) =================================================================== --- configure.ac 2017-05-10 19:03:46 +0900 (2ceff05) +++ configure.ac 2017-05-11 14:25:10 +0900 (4362386) @@ -625,7 +625,7 @@ if test "x$have_epoll" != "xyes"; then ]) ]) if test "x$have_kqueue" != "xyes"; then - AC_CHECK_HEADER(sys/poll.h, [ + AC_CHECK_HEADER(poll.h, [ AC_CHECK_FUNC(poll, [ have_poll="yes" AC_DEFINE(USE_POLL, [1], [use poll]) Modified: lib/grn_com.h (+1 -1) =================================================================== --- lib/grn_com.h 2017-05-10 19:03:46 +0900 (c1451b1) +++ lib/grn_com.h 2017-05-11 14:25:10 +0900 (f407723) @@ -83,7 +83,7 @@ GRN_API grn_com_queue_entry *grn_com_queue_deque(grn_ctx *ctx, grn_com_queue *q) # define GRN_COM_POLLIN EVFILT_READ # define GRN_COM_POLLOUT EVFILT_WRITE # else /* USE_KQUEUE */ -# include <sys/poll.h> +# include <poll.h> # define GRN_COM_POLLIN POLLIN # define GRN_COM_POLLOUT POLLOUT # endif /* USE_KQUEUE */ -------------- next part -------------- HTML����������������������������...下载
