r19305@catbus: nickm | 2008-04-10 15:34:10 -0400

 Fix bug 1938754: do not warn when epoll_create() fails with ENOSYS.

svn:r706

diff --git a/ChangeLog b/ChangeLog
index fb87671e260416ee050e02bfeeb4e56a5defb864..787ad68454c2fc9221bc474e7786551ff2d3e1e2 100644 (file)
--- 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 59ccd4a677e16c281389d308d44190d4533274ac..1b24f040f65daea0c490342c614aa413d9334da5 100644 (file)
--- 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 52420f5538705bf289175ed428a716d1f646f10a..67c0f46911c22975f39295d7af7b08d5cefc5aed 100644 (file)
--- 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);
        }