[GNUnet-SVN] [libmicrohttpd] GNU libmicrohttpd branch master updated. a90099030e9aa0ec216e6b5cf439c265d8a43376

[gitolite]

The branch, master has been updated
       via  a90099030e9aa0ec216e6b5cf439c265d8a43376 (commit)
      from  56cccc6da257000049292016e1bda822c3934967 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit a90099030e9aa0ec216e6b5cf439c265d8a43376
Author: Evgeny Grin (Karlson2k) <address@hidden>
Date:   Fri Oct 14 16:54:23 2016 +0300

    Remove leftover "linux only" on epoll fd.

-----------------------------------------------------------------------

Summary of changes:
 doc/libmicrohttpd.texi  | 2 +-
 src/microhttpd/daemon.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/libmicrohttpd.texi b/doc/libmicrohttpd.texi
index 4aca3be..128a91a 100644
--- a/doc/libmicrohttpd.texi
+++ b/doc/libmicrohttpd.texi
@@ -2662,7 +2662,7 @@ was specified and a client needs to learn what port
 is actually being used by MHD.
 No extra arguments should be passed.
 
address@hidden MHD_DAEMON_INFO_EPOLL_FD_LINUX_ONLY
address@hidden MHD_DAEMON_INFO_EPOLL_FD
 @cindex epoll
 Request the file-descriptor number that MHD is using for epoll.  If
 the build is not supporting epoll, NULL is returned; if we are using a
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
index 47ab03a..a5b0769 100644
--- a/src/microhttpd/daemon.c
+++ b/src/microhttpd/daemon.c
@@ -5407,7 +5407,7 @@ MHD_get_daemon_info (struct MHD_Daemon *daemon,
     case MHD_DAEMON_INFO_LISTEN_FD:
       return (const union MHD_DaemonInfo *) &daemon->socket_fd;
 #ifdef EPOLL_SUPPORT
-    case MHD_DAEMON_INFO_EPOLL_FD_LINUX_ONLY:
+    case MHD_DAEMON_INFO_EPOLL_FD:
       return (const union MHD_DaemonInfo *) &daemon->epoll_fd;
 #endif
     case MHD_DAEMON_INFO_CURRENT_CONNECTIONS:


hooks/post-receive
-- 
GNU libmicrohttpd