[GNUnet-SVN] r38063 - libmicrohttpd/src/microhttpd

[gnunet]

Author: Karlson2k
Date: 2016-10-03 16:31:42 +0200 (Mon, 03 Oct 2016)
New Revision: 38063

Modified:
   libmicrohttpd/src/microhttpd/daemon.c
   libmicrohttpd/src/microhttpd/mhd_itc.h
Log:
daemon.c: fix compiling with new ITC

Modified: libmicrohttpd/src/microhttpd/daemon.c
===================================================================
--- libmicrohttpd/src/microhttpd/daemon.c       2016-10-01 20:02:13 UTC (rev 
38062)
+++ libmicrohttpd/src/microhttpd/daemon.c       2016-10-03 14:31:42 UTC (rev 
38063)
@@ -1370,7 +1370,7 @@
              goto exit;
            }
 #if WINDOWS
-          if (! MHD_INVALID_PIPE_(deamon->wpipe) )
+          if (! MHD_INVALID_PIPE_(daemon->wpipe) )
             {
               if (! MHD_add_to_fd_set_ (MHD_pipe_get_read_fd_ (daemon->wpipe),
                                         &rs,
@@ -2852,7 +2852,7 @@
         {
           FD_CLR (daemon->socket_fd,
                   &rs);
-          if (! MHD_add_to_fd_set_ (daemon->wpipe[0],
+          if (! MHD_add_to_fd_set_ (MHD_pipe_get_read_fd_(daemon->wpipe),
                                     &rs,
                                     &maxsock,
                                     FD_SETSIZE))

Modified: libmicrohttpd/src/microhttpd/mhd_itc.h
===================================================================
--- libmicrohttpd/src/microhttpd/mhd_itc.h      2016-10-01 20:02:13 UTC (rev 
38062)
+++ libmicrohttpd/src/microhttpd/mhd_itc.h      2016-10-03 14:31:42 UTC (rev 
38063)
@@ -244,9 +244,9 @@
 /**
  * Close emulated pipe FDs
  */
-#define MHD_pipe_close_(fd) do { \
-   MHD_socket_close_ (pip.fd[0]); \
-   MHD_socket_close_ (pip.fd[1]); \
+#define MHD_pipe_close_(pip) do { \
+   MHD_socket_close_ ((pip).fd[0]); \
+   MHD_socket_close_ ((pip).fd[1]); \
 } while (0)
 
 /**