X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fcompat%2Fpoll.h;h=77c46a1d08d60ac8bca806628f368fc46fc915c2;hp=f892c832333eb10bdfcc4cf64d66918c17d3ab02;hb=a97dd6ce0d6f658c50b7cca73724fd8e1d5a36a1;hpb=f263b7fd113e51d0737554e8232b8669e142a260

diff --git a/src/common/compat/poll.h b/src/common/compat/poll.h
index f892c8323..77c46a1d0 100644
--- a/src/common/compat/poll.h
+++ b/src/common/compat/poll.h
@@ -73,7 +73,7 @@ enum {
 	LPOLLNVAL = EPOLLHUP,
 	LPOLLRDHUP = EPOLLRDHUP,
 	/* Close on exec feature of epoll */
-#if __GLIBC_PREREQ(2, 9)
+#if defined(HAVE_EPOLL_CREATE1) && defined(EPOLL_CLOEXEC)
 	LTTNG_CLOEXEC = EPOLL_CLOEXEC,
 #else
 	/*
@@ -127,7 +127,7 @@ extern int compat_epoll_create(struct lttng_poll_event *events,
 #define lttng_poll_create(events, size, flags) \
 	compat_epoll_create(events, size, flags)
 
-#if __GLIBC_PREREQ(2, 9)
+#if defined(HAVE_EPOLL_CREATE1) && defined(EPOLL_CLOEXEC)
 static inline int compat_glibc_epoll_create(int size __attribute__((unused)),
 		int flags)
 {
@@ -174,7 +174,7 @@ extern int compat_epoll_del(struct lttng_poll_event *events, int fd);
 /*
  * Set up the poll set limits variable poll_max_size
  */
-extern void compat_epoll_set_max_size(void);
+extern int compat_epoll_set_max_size(void);
 #define lttng_poll_set_max_size() \
 	compat_epoll_set_max_size()
 
@@ -217,7 +217,7 @@ static inline void lttng_poll_clean(struct lttng_poll_event *events)
 	if (events->epfd >= 0) {
 		ret = close(events->epfd);
 		if (ret) {
-			perror("close");
+			PERROR("close");
 		}
 	}
 
@@ -254,7 +254,7 @@ enum {
 #if __linux__
 	LPOLLMSG = POLLMSG,
 	LPOLLRDHUP = POLLRDHUP,
-#elif (defined(__FreeBSD__) || defined(__CYGWIN__))
+#elif (defined(__FreeBSD__) || defined(__CYGWIN__) || defined(__sun__) || defined(__APPLE__))
 	LPOLLMSG = 0,
 	LPOLLRDHUP = 0,
 #else
@@ -285,8 +285,7 @@ struct compat_poll_event {
 	 * execution before a poll wait is done.
 	 */
 	struct compat_poll_event_array current;
-	/* Indicate if wait.events needs to be realloc. */
-	int need_realloc:1;
+
 	/* Indicate if wait.events need to be updated from current. */
 	int need_update:1;
 };
@@ -351,7 +350,7 @@ extern int compat_poll_del(struct lttng_poll_event *events, int fd);
 /*
  * Set up the poll set limits variable poll_max_size
  */
-extern void compat_poll_set_max_size(void);
+extern int compat_poll_set_max_size(void);
 #define lttng_poll_set_max_size() \
 	compat_poll_set_max_size()