2004-10-19 Roland McGrath <roland@redhat.com>

	* configure.ac: Check for sys/epoll.h.
	* desc.c: Protect #include <sys/epoll.h> with [HAVE_SYS_EPOLL_H].
	(epollctls, epollevents): Protect each entry with #ifdef on its macro.

diff --git a/configure.ac b/configure.ac
index ffbab74bb975f651009d9311b921047e0c7c030e..91000376221dcc4bbe10585102060a02af036a8f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to create configure.  Use autoreconf.
 AC_PREREQ(2.57)
-AC_INIT([strace],[4.5.7])
+AC_INIT([strace],[4.5.8])
 AC_CONFIG_SRCDIR([strace.c])
 AM_CONFIG_HEADER([config.h])
 AM_INIT_AUTOMAKE([foreign check-news dist-bzip2])
@@ -193,7 +193,7 @@ AC_CHECK_LIB(nsl, main)
 fi
 
 AC_CHECK_FUNCS(sigaction strerror strsignal pread sys_siglist _sys_siglist getdents mctl prctl sendmsg inet_ntop if_indextoname)
-AC_CHECK_HEADERS([sys/reg.h sys/filio.h sys/acl.h sys/asynch.h sys/door.h stropts.h sys/conf.h sys/stream.h sys/tihdr.h sys/tiuser.h sys/sysconfig.h ioctls.h sys/ioctl.h sys/ptrace.h termio.h linux/ptrace.h asm/reg.h sys/uio.h sys/aio.h  poll.h sys/poll.h sys/vfs.h asm/sysmips.h linux/utsname.h sys/nscsys.h mqueue.h], [], [])
+AC_CHECK_HEADERS([sys/reg.h sys/filio.h sys/acl.h sys/asynch.h sys/door.h stropts.h sys/conf.h sys/stream.h sys/tihdr.h sys/tiuser.h sys/sysconfig.h ioctls.h sys/ioctl.h sys/ptrace.h termio.h linux/ptrace.h asm/reg.h sys/uio.h sys/aio.h  poll.h sys/poll.h sys/vfs.h asm/sysmips.h linux/utsname.h sys/nscsys.h mqueue.h sys/epoll.h], [], [])
 AC_CHECK_HEADERS([linux/icmp.h linux/in6.h linux/netlink.h linux/if_packet.h],
                  [], [], [#include <linux/socket.h>])
 AC_CHECK_HEADERS([asm/sigcontext.h], [], [], [#include <signal.h>])

diff --git a/desc.c b/desc.c
index 403c8ece944a67ae924cb4a04866b9b6469b578d..eaff3e04b72743f609720e40ef2838bb7cd5edbf 100644 (file)
--- a/desc.c
+++ b/desc.c
@@ -645,7 +645,7 @@ struct tcb *tcp;
                else {
 #ifdef HAVE_SYS_EPOLL_H
                        struct epoll_event ev;
-                       else if (umove(tcp, tcp->u_arg[3], &ev) == 0)
+                       if (umove(tcp, tcp->u_arg[3], &ev) == 0)
                                print_epoll_event(&ev);
                        else
 #endif