[GNUnet-SVN] r13056 - libmicrohttpd/src/testcurl

[gnunet]

Author: wachs
Date: 2010-09-21 17:22:22 +0200 (Tue, 21 Sep 2010)
New Revision: 13056

Modified:
   libmicrohttpd/src/testcurl/daemontest_digestauth.c
   libmicrohttpd/src/testcurl/daemontest_get.c
   libmicrohttpd/src/testcurl/daemontest_get_sendfile.c
   libmicrohttpd/src/testcurl/daemontest_termination.c
Log:
Changes to get testcases to compile under Windows (MINGW)

Modified: libmicrohttpd/src/testcurl/daemontest_digestauth.c
===================================================================
--- libmicrohttpd/src/testcurl/daemontest_digestauth.c  2010-09-21 15:14:42 UTC 
(rev 13055)
+++ libmicrohttpd/src/testcurl/daemontest_digestauth.c  2010-09-21 15:22:22 UTC 
(rev 13056)
@@ -31,9 +31,9 @@
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
-#include <sys/socket.h>
 
 #ifndef WINDOWS
+#include <sys/socket.h>
 #include <unistd.h>
 #endif
 

Modified: libmicrohttpd/src/testcurl/daemontest_get.c
===================================================================
--- libmicrohttpd/src/testcurl/daemontest_get.c 2010-09-21 15:14:42 UTC (rev 
13055)
+++ libmicrohttpd/src/testcurl/daemontest_get.c 2010-09-21 15:22:22 UTC (rev 
13056)
@@ -32,10 +32,14 @@
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
-#include <sys/socket.h>
 
+#ifdef __MINGW32__
+#define usleep(usec) (Sleep ((usec) / 1000),0)
+#endif
+
 #ifndef WINDOWS
 #include <unistd.h>
+#include <sys/socket.h>
 #endif
 
 static int oneone;

Modified: libmicrohttpd/src/testcurl/daemontest_get_sendfile.c
===================================================================
--- libmicrohttpd/src/testcurl/daemontest_get_sendfile.c        2010-09-21 
15:14:42 UTC (rev 13055)
+++ libmicrohttpd/src/testcurl/daemontest_get_sendfile.c        2010-09-21 
15:22:22 UTC (rev 13056)
@@ -32,11 +32,11 @@
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
-#include <sys/socket.h>
 #include <sys/types.h>
 #include <fcntl.h>
 
 #ifndef WINDOWS
+#include <sys/socket.h>
 #include <unistd.h>
 #endif
 

Modified: libmicrohttpd/src/testcurl/daemontest_termination.c
===================================================================
--- libmicrohttpd/src/testcurl/daemontest_termination.c 2010-09-21 15:14:42 UTC 
(rev 13055)
+++ libmicrohttpd/src/testcurl/daemontest_termination.c 2010-09-21 15:22:22 UTC 
(rev 13056)
@@ -25,18 +25,21 @@
  */
 #define PORT   12345
 
+#include "platform.h"
 #include <stdio.h>
 #include <string.h>
 #include <stdint.h>
 #include <stdarg.h>
 #include <stdlib.h>
 #include <sys/types.h>
-#include <sys/select.h>
-#include <sys/socket.h>
 #include <microhttpd.h>
 #include <unistd.h>
 #include <curl/curl.h>
 
+#ifndef __MINGW32__
+#include <sys/select.h>
+#include <sys/socket.h>
+#endif
 
 static int
 connection_handler (void *cls,