From 46deb7ca8298084b6169ac6349b24797e35623a7 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Mon, 19 Sep 2011 21:02:29 +0200 Subject: fd_util: include check.h, verify config.h was included --- src/fd_util.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/fd_util.h') diff --git a/src/fd_util.h b/src/fd_util.h index 5b80df2c7..647860a97 100644 --- a/src/fd_util.h +++ b/src/fd_util.h @@ -36,6 +36,8 @@ #ifndef FD_UTIL_H #define FD_UTIL_H +#include "check.h" + #include #include -- cgit v1.2.3 From 77a56c7c5a1ab6bc0d76e0cf55f24071be7c4b5f Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Mon, 19 Sep 2011 21:03:08 +0200 Subject: fd_util: check HAVE_INOTIFY_INIT in header Don't provide the prototype if inotify_init() was not detected. --- src/fd_util.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/fd_util.h') diff --git a/src/fd_util.h b/src/fd_util.h index 647860a97..3d465b200 100644 --- a/src/fd_util.h +++ b/src/fd_util.h @@ -122,6 +122,8 @@ recvmsg_cloexec(int sockfd, struct msghdr *msg, int flags); #endif +#ifdef HAVE_INOTIFY_INIT + /** * Wrapper for inotify_init(), which sets the CLOEXEC flag (atomically * if supported by the OS). @@ -130,3 +132,5 @@ int inotify_init_cloexec(void); #endif + +#endif -- cgit v1.2.3 From c476819cb1186770b1b7395851e394caac39cbc8 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Mon, 19 Sep 2011 21:04:19 +0200 Subject: fd_util: add function close_socket() Wrap close(), use closesocket() on WIN32/WinSock. --- src/fd_util.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/fd_util.h') diff --git a/src/fd_util.h b/src/fd_util.h index 3d465b200..d74bb30d8 100644 --- a/src/fd_util.h +++ b/src/fd_util.h @@ -133,4 +133,10 @@ inotify_init_cloexec(void); #endif +/** + * Portable wrapper for close(); use closesocket() on WIN32/WinSock. + */ +int +close_socket(int fd); + #endif -- cgit v1.2.3