From 44ceb945a37cc3b791b59b4ac1a9c669eb3e7e2e Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Thu, 10 Apr 2008 19:34:50 +0000 Subject: [PATCH] r19305@catbus: nickm | 2008-04-10 15:34:10 -0400 Fix bug 1938754: do not warn when epoll_create() fails with ENOSYS. svn:r706 --- ChangeLog | 1 + configure.in | 2 +- epoll.c | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index fb87671e..787ad684 100644 --- a/ChangeLog +++ b/ChangeLog @@ -63,6 +63,7 @@ Changes in current version: o make RPC replies use application/octet-stream as mime type o do not delete uninitialized timeout event in evdns o Correct the documentation on buffer printf functions. + o Don't warn on unimplemented epoll_create(): this isn't a problem, just a reason to fall back to poll or select. Changes in 1.4.0: diff --git a/configure.in b/configure.in index 59ccd4a6..1b24f040 100644 --- a/configure.in +++ b/configure.in @@ -381,7 +381,7 @@ if test x$enable_gcc_warnings = xyes; then #error #endif]), have_gcc42=yes, have_gcc42=no) - CFLAGS="$CFLAGS -W -Wfloat-equal -Wundef -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wwrite-strings -Wredundant-decls -Wchar-subscripts -Wcomment -Wformat=2 -Wwrite-strings -Wmissing-declarations -Wredundant-decls -Wnested-externs -Wbad-function-cast -Wswitch-enum -Werror" + CFLAGS="$CFLAGS -W -Wfloat-equal -Wundef -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wwrite-strings -Wredundant-decls -Wchar-subscripts -Wcomment -Wformat -Wwrite-strings -Wmissing-declarations -Wredundant-decls -Wnested-externs -Wbad-function-cast -Wswitch-enum -Werror" CFLAGS="$CFLAGS -Wno-unused-parameter -Wno-sign-compare -Wstrict-aliasing" if test x$have_gcc4 = xyes ; then diff --git a/epoll.c b/epoll.c index 52420f55..67c0f469 100644 --- a/epoll.c +++ b/epoll.c @@ -120,7 +120,8 @@ epoll_init(struct event_base *base) /* Initalize the kernel queue */ if ((epfd = epoll_create(nfiles)) == -1) { - event_warn("epoll_create"); + if (errno != ENOSYS) + event_warn("epoll_create"); return (NULL); } -- 2.40.0