From: Simon Marchi <simon.marchi@polymtl.ca>
Date: Sun, 26 Jan 2020 22:21:33 +0000 (-0500)
Subject: Sync ax_have_epoll.m4 with autoconf-archive
X-Git-Tag: v2.12.0-rc1~26
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=875b29bfdafecb38a552264b0775478eaef0cae1;p=lttng-tools.git

Sync ax_have_epoll.m4 with autoconf-archive

This updates gets rid of an unused variable warning at configure time,
so removes one hurdle to configure with CFLAGS="-Werror".

Change-Id: I7adfed3f821409d7ea36c79e19e96b1977e32804
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

diff --git a/m4/ax_have_epoll.m4 b/m4/ax_have_epoll.m4
index 9d9bc8736..8b23e1aa1 100644
--- a/m4/ax_have_epoll.m4
+++ b/m4/ax_have_epoll.m4
@@ -42,7 +42,7 @@
 #   and this notice are preserved. This file is offered as-is, without any
 #   warranty.
 
-#serial 11
+#serial 12
 
 AC_DEFUN([AX_HAVE_EPOLL], [dnl
   ax_have_epoll_cppflags="${CPPFLAGS}"
@@ -59,10 +59,10 @@ AC_DEFUN([AX_HAVE_EPOLL], [dnl
 #  endif
 #endif
 ], [dnl
-int fd, rc;
+int fd;
 struct epoll_event ev;
 fd = epoll_create(128);
-rc = epoll_wait(fd, &ev, 1, 0);])],
+epoll_wait(fd, &ev, 1, 0);])],
       [ax_cv_have_epoll=yes],
       [ax_cv_have_epoll=no])])
   CPPFLAGS="${ax_have_epoll_cppflags}"
@@ -89,11 +89,11 @@ AC_DEFUN([AX_HAVE_EPOLL_PWAIT], [dnl
 #include <sys/epoll.h>
 #include <signal.h>
 ], [dnl
-int fd, rc;
+int fd;
 struct epoll_event ev;
 fd = epoll_create(128);
-rc = epoll_wait(fd, &ev, 1, 0);
-rc = epoll_pwait(fd, &ev, 1, 0, (sigset_t const *)(0));])],
+epoll_wait(fd, &ev, 1, 0);
+epoll_pwait(fd, &ev, 1, 0, (sigset_t const *)(0));])],
       [ax_cv_have_epoll_pwait=yes],
       [ax_cv_have_epoll_pwait=no])])
   CPPFLAGS="${ax_have_epoll_cppflags}"