--- trunk/tests/http-client-bad-body.c	2008/05/31 21:39:39	114
+++ trunk/tests/http-client-bad-body.c	2008/06/02 17:53:43	126
@@ -17,21 +17,38 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
+#include <config.h>
+
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
+#ifdef HAVE_ARPA_INET_H
 #include <arpa/inet.h>
-#include <netinet/in.h>
+#endif
+#ifdef HAVE_NETDB_H
 #include <netdb.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
+#endif
 #include <unistd.h>
 
 #include "http-server.h"
 #include "util.h"
 
 int main(int argc, char ** argv) {
+#ifdef __MINGW32__
+  WSADATA data;
+  if (WSAStartup(MAKEWORD(1, 1), &data) != 0) {
+    return 1;
+  }
+#endif
+
   int result;
 
   if (argc < 3) {
@@ -53,8 +70,8 @@
   a.sin_port = htons(connect_port);
   a.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
 
-  int s = socket(PF_INET, SOCK_STREAM, 0);
-  assert(s > 0);
+  SOCKET s = socket(PF_INET, SOCK_STREAM, 0);
+  assert(s != INVALID_SOCKET);
 
   result = connect(s, (struct sockaddr *) &a, sizeof(a));
   assert(result == 0);
@@ -76,6 +93,6 @@
     }
   }
 
-  close(s);
+  closesocket(s);
   return 0;
 }