From 062fc3d82f245d6166457ebb0af9ea38abc30378 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 8 Mar 2016 14:55:04 +0200 Subject: [PATCH] Fix: build failure when __GLIBC_PREREQ is missing MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The musl C library does not provide the __GLIBC_PREREQ macro. Instead of relying on glibc version test, check directly for the availability of epoll_create1(). Signed-off-by: Baruch Siach Signed-off-by: Jérémie Galarneau --- configure.ac | 2 +- src/common/compat/poll.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 391c781e1..ef9894cc9 100644 --- a/configure.ac +++ b/configure.ac @@ -122,7 +122,7 @@ AC_CHECK_FUNCS([ \ gethostbyname gethostname getpagesize localtime_r memchr memset \ mkdir munmap putenv realpath rmdir socket strchr strcspn strdup \ strncasecmp strndup strnlen strpbrk strrchr strstr strtol strtoul \ - strtoull dirfd gethostbyname2 getipnodebyname \ + strtoull dirfd gethostbyname2 getipnodebyname epoll_create1 \ ]) # Babeltrace viewer check diff --git a/src/common/compat/poll.h b/src/common/compat/poll.h index 5f45da2b3..34d0cffda 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) { -- 2.34.1