[libmicrohttpd] branch master updated (b3b6c570 -> 4f019420)

[gnunet]

This is an automated email from the git hooks/post-receive script.

karlson2k pushed a change to branch master
in repository libmicrohttpd.

    from b3b6c570 Added local patches for autotools (mainly for libtool)
     new 31360bbd mhd_sockets: minor macro correction
     new 4f019420 microhttpd.h: minor doxy fixes

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/include/microhttpd.h     | 6 +++---
 src/microhttpd/daemon.c      | 4 ++--
 src/microhttpd/mhd_sockets.h | 3 ++-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/include/microhttpd.h b/src/include/microhttpd.h
index aedef5de..a6032d8b 100644
--- a/src/include/microhttpd.h
+++ b/src/include/microhttpd.h
@@ -2743,7 +2743,7 @@ MHD_add_connection (struct MHD_Daemon *daemon,
  * before calling this function. FD_SETSIZE is assumed
  * to be platform's default.
  *
- * This function should only be called only when MHD is configured to
+ * This function should be called only when MHD is configured to
  * use "external" sockets polling with 'select()' or with 'epoll'.
  * In the latter case, it will only add the single 'epoll' file
  * descriptor used by MHD to the sets.
@@ -2784,7 +2784,7 @@ MHD_get_fdset (struct MHD_Daemon *daemon,
  * Passing custom FD_SETSIZE as @a fd_setsize allow usage of
  * larger/smaller than platform's default fd_sets.
  *
- * This function should only be called only when MHD is configured to
+ * This function should be called only when MHD is configured to
  * use "external" sockets polling with 'select()' or with 'epoll'.
  * In the latter case, it will only add the single 'epoll' file
  * descriptor used by MHD to the sets.
@@ -2825,7 +2825,7 @@ MHD_get_fdset2 (struct MHD_Daemon *daemon,
  * before calling this function. Size of fd_set is
  * determined by current value of FD_SETSIZE.
  *
- * This function should only be called only when MHD is configured to
+ * This function should be called only when MHD is configured to
  * use "external" sockets polling with 'select()' or with 'epoll'.
  * In the latter case, it will only add the single 'epoll' file
  * descriptor used by MHD to the sets.
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
index 0c9ee2e8..9f220263 100644
--- a/src/microhttpd/daemon.c
+++ b/src/microhttpd/daemon.c
@@ -700,7 +700,7 @@ MHD_TLS_init (struct MHD_Daemon *daemon)
  * before calling this function. FD_SETSIZE is assumed
  * to be platform's default.
  *
- * This function should only be called only when MHD is configured to
+ * This function should be called only when MHD is configured to
  * use "external" sockets polling with 'select()' or with 'epoll'.
  * In the latter case, it will only add the single 'epoll' file
  * descriptor used by MHD to the sets.
@@ -1107,7 +1107,7 @@ internal_get_fdset2 (struct MHD_Daemon *daemon,
  * Passing custom FD_SETSIZE as @a fd_setsize allow usage of
  * larger/smaller than platform's default fd_sets.
  *
- * This function should only be called only when MHD is configured to
+ * This function should be called only when MHD is configured to
  * use "external" sockets polling with 'select()' or with 'epoll'.
  * In the latter case, it will only add the single 'epoll' file
  * descriptor used by MHD to the sets.
diff --git a/src/microhttpd/mhd_sockets.h b/src/microhttpd/mhd_sockets.h
index 9ff2e372..d09cc522 100644
--- a/src/microhttpd/mhd_sockets.h
+++ b/src/microhttpd/mhd_sockets.h
@@ -205,7 +205,8 @@ typedef SOCKET MHD_socket;
 #endif
 
 #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || \
-  defined(MHD_WINSOCK_SOCKETS) || defined(__MACH__) || defined(__sun)
+  defined(MHD_WINSOCK_SOCKETS) || defined(__MACH__) || defined(__sun) || \
+  defined(SOMEBSD)
 /* Most of OSes inherit nonblocking setting from the listen socket */
 #define MHD_ACCEPT_INHERIT_NONBLOCK 1
 #endif

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.