[GNUnet-SVN] r19590 - in libmicrohttpd: . src/daemon

[gnunet]

Author: grothoff
Date: 2012-02-01 09:40:41 +0100 (Wed, 01 Feb 2012)
New Revision: 19590

Modified:
   libmicrohttpd/AUTHORS
   libmicrohttpd/ChangeLog
   libmicrohttpd/src/daemon/daemon.c
Log:
BS: fixing compilation problem on MinGW

Modified: libmicrohttpd/AUTHORS
===================================================================
--- libmicrohttpd/AUTHORS       2012-01-31 23:48:22 UTC (rev 19589)
+++ libmicrohttpd/AUTHORS       2012-02-01 08:40:41 UTC (rev 19590)
@@ -37,6 +37,7 @@
 LRN <address@hidden>
 Sven Geggus <address@hidden>
 Steve Wolf <address@hidden>
+Brecht Sanders <address@hidden>
 
 Documentation contributions also came from:
 Marco Maggi <address@hidden>

Modified: libmicrohttpd/ChangeLog
===================================================================
--- libmicrohttpd/ChangeLog     2012-01-31 23:48:22 UTC (rev 19589)
+++ libmicrohttpd/ChangeLog     2012-02-01 08:40:41 UTC (rev 19590)
@@ -1,3 +1,6 @@
+Wed Feb  1 09:39:12 CET 2012
+       Fixed compilation problem on MinGW. -BS
+
 Tue Jan 31 17:50:24 CET 2012
        Releasing 0.9.19. -CG
 

Modified: libmicrohttpd/src/daemon/daemon.c
===================================================================
--- libmicrohttpd/src/daemon/daemon.c   2012-01-31 23:48:22 UTC (rev 19589)
+++ libmicrohttpd/src/daemon/daemon.c   2012-02-01 08:40:41 UTC (rev 19590)
@@ -956,6 +956,7 @@
 #endif
   {
     /* make socket non-blocking */
+#ifndef MINGW
     int flags = fcntl (connection->socket_fd, F_GETFL);
     if ( (flags == -1) ||
         (0 != fcntl (connection->socket_fd, F_SETFL, flags | O_NONBLOCK)) )
@@ -965,6 +966,16 @@
                STRERROR (errno));
 #endif
       }
+#else
+    unsigned long flags = 1;
+    if (0 != ioctlsocket (connection->socket_fd, FIONBIO, &flags))
+#endif
+      {
+#if HAVE_MESSAGES
+       FPRINTF(stderr, "Failed to make socket non-blocking: %s\n", 
+               STRERROR (errno));
+#endif
+      }
   }
 
 #if HTTPS_SUPPORT