[GNUnet-SVN] [libmicrohttpd] branch master updated (6c67437c -> aac24654)

[gnunet]

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

karlson2k pushed a change to branch master
in repository libmicrohttpd.

    from 6c67437c configure.ac: fixed typo in report text
     new e6d9d82e mhd_sockets.h: Fixed compiler warnings
     new aac24654 Upgraded: fixed check for error state on socket

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/microhttpd/daemon.c      | 8 ++++----
 src/microhttpd/mhd_sockets.h | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
index 3e48ef66..6a112546 100644
--- a/src/microhttpd/daemon.c
+++ b/src/microhttpd/daemon.c
@@ -716,7 +716,7 @@ urh_to_fdset (struct MHD_UpgradeResponseHandle *urh,
         res = false;
       /* Do not monitor again for errors if error was detected before as
        * error state is remembered. */
-      if ((0 == urh->app.celi & MHD_EPOLL_STATE_ERROR) &&
+      if ((0 == (urh->app.celi & MHD_EPOLL_STATE_ERROR)) &&
           ((0 != urh->in_buffer_size) ||
            (0 != urh->out_buffer_size) ||
            (0 != urh->out_buffer_used)))
@@ -741,7 +741,7 @@ urh_to_fdset (struct MHD_UpgradeResponseHandle *urh,
         res = false;
       /* Do not monitor again for errors if error was detected before as
        * error state is remembered. */
-      if ((0 == urh->mhd.celi & MHD_EPOLL_STATE_ERROR) &&
+      if ((0 == (urh->mhd.celi & MHD_EPOLL_STATE_ERROR)) &&
           ((0 != urh->out_buffer_size) ||
            (0 != urh->in_buffer_size) ||
            (0 != urh->in_buffer_used)))
@@ -820,7 +820,7 @@ urh_update_pollfd(struct MHD_UpgradeResponseHandle *urh,
 
   /* Do not monitor again for errors if error was detected before as
    * error state is remembered. */
-  if ((0 == urh->app.celi & MHD_EPOLL_STATE_ERROR) &&
+  if ((0 == (urh->app.celi & MHD_EPOLL_STATE_ERROR)) &&
       ((0 != urh->in_buffer_size) ||
        (0 != urh->out_buffer_size) ||
        (0 != urh->out_buffer_used)))
@@ -833,7 +833,7 @@ urh_update_pollfd(struct MHD_UpgradeResponseHandle *urh,
 
   /* Do not monitor again for errors if error was detected before as
    * error state is remembered. */
-  if ((0 == urh->mhd.celi & MHD_EPOLL_STATE_ERROR) &&
+  if ((0 == (urh->mhd.celi & MHD_EPOLL_STATE_ERROR)) &&
       ((0 != urh->out_buffer_size) ||
        (0 != urh->in_buffer_size) ||
        (0 != urh->in_buffer_used)))
diff --git a/src/microhttpd/mhd_sockets.h b/src/microhttpd/mhd_sockets.h
index 3ebe0dc1..4a4c5cd9 100644
--- a/src/microhttpd/mhd_sockets.h
+++ b/src/microhttpd/mhd_sockets.h
@@ -281,10 +281,10 @@
  *         boolean false otherwise.
  */
 #if defined(MHD_POSIX_SOCKETS)
-#  define MHD_SCKT_FD_FITS_FDSET_SETSIZE_(fd,pset,setsize) ((fd) < (setsize))
+#  define MHD_SCKT_FD_FITS_FDSET_SETSIZE_(fd,pset,setsize) ((fd) < 
((MHD_socket)setsize))
 #elif defined(MHD_WINSOCK_SOCKETS)
 #  define MHD_SCKT_FD_FITS_FDSET_SETSIZE_(fd,pset,setsize) ( 
((void*)(pset)==(void*)0) || \
-                                                             
(((fd_set*)(pset))->fd_count < (setsize)) || \
+                                                             
(((fd_set*)(pset))->fd_count < ((unsigned)setsize)) || \
                                                              
(FD_ISSET((fd),(pset))) )
 #endif
 

-- 
To stop receiving notification emails like this one, please contact
address@hidden