--- ../SOURCES/libmicrohttpd-0.9.27/src/microhttpd/test_postprocessor.c	2013-05-05 11:13:10.000000000 -0500
+++ libmicrohttpd-0.9.27/src/microhttpd/test_postprocessor.c	2013-08-07 09:39:27.931394225 -0500
@@ -139,7 +139,11 @@
   size = strlen (URL_DATA);
   while (i < size)
     {
-      delta = 1 + RANDOM () % (size - i);
+#ifndef WINDOWS
+      delta = 1 + random () % (size - i);
+#else
+      delta = 1 + rand () % (size - i);
+#endif
       MHD_post_process (pp, &URL_DATA[i], delta);
       i += delta;
     }
@@ -174,7 +178,11 @@
   size = strlen (FORM_DATA);
   while (i < size)
     {
-      delta = 1 + RANDOM () % (size - i);
+#ifndef WINDOWS
+      delta = 1 + random () % (size - i);
+#else
+      delta = 1 + rand () % (size - i);
+#endif
       MHD_post_process (pp, &FORM_DATA[i], delta);
       i += delta;
     }
@@ -209,7 +217,11 @@
   size = strlen (FORM_NESTED_DATA);
   while (i < size)
     {
-      delta = 1 + RANDOM () % (size - i);
+#ifndef WINDOWS
+      delta = 1 + random () % (size - i);
+#else
+      delta = 1 + rand () % (size - i);
+#endif
       MHD_post_process (pp, &FORM_NESTED_DATA[i], delta);
       i += delta;
     }
@@ -243,7 +255,11 @@
   size = strlen (URL_EMPTY_VALUE_DATA);
   while (i < size)
     {
-      delta = 1 + RANDOM () % (size - i);
+#ifndef WINDOWS
+      delta = 1 + random () % (size - i);
+#else
+      delta = 1 + rand () % (size - i);
+#endif
       MHD_post_process (pp, &URL_EMPTY_VALUE_DATA[i], delta);
       i += delta;
     }
--- ../SOURCES/libmicrohttpd-0.9.27/src/microhttpd/test_postprocessor_large.c	2013-05-05 11:12:55.000000000 -0500
+++ libmicrohttpd-0.9.27/src/microhttpd/test_postprocessor_large.c	2013-08-07 09:39:54.894474405 -0500
@@ -83,7 +83,11 @@
   size = strlen (data);
   while (i < size)
     {
-      delta = 1 + RANDOM () % (size - i);
+#ifndef WINDOWS
+      delta = 1 + random () % (size - i);
+#else
+      delta = 1 + rand () % (size - i);
+#endif
       MHD_post_process (pp, &data[i], delta);
       i += delta;
     }
--- ../SOURCES/libmicrohttpd-0.9.27/src/testcurl/Makefile.am	2013-08-05 17:44:35.784685204 -0500
+++ libmicrohttpd-0.9.27/src/testcurl/Makefile.am	2013-08-07 10:58:36.004565109 -0500
@@ -24,7 +24,6 @@
 check_PROGRAMS = \
   test_start_stop \
   test_get \
-  test_quiesce \
   test_get_sendfile \
   test_urlparse \
   test_put \
@@ -47,6 +46,10 @@
   $(CURL_FORK_TEST) \
   perf_get $(PERF_GET_CONCURRENT)
 
+if !HAVE_W32
+check_PROGRAMS += test_quiesce
+endif
+
 if HAVE_POSTPROCESSOR
  check_PROGRAMS += \
   test_post \
--- ../SOURCES/libmicrohttpd-0.9.27/src/testcurl/test_get_sendfile.c	2012-10-08 15:55:12.000000000 -0500
+++ libmicrohttpd-0.9.27/src/testcurl/test_get_sendfile.c	2013-08-07 11:01:12.041212786 -0500
@@ -93,7 +93,7 @@
     {
       fprintf (stderr, "Failed to open `%s': %s\n",
 	       sourcefile,
-	       STRERROR (errno));
+	       strerror (errno));
       exit (1);
     }
   response = MHD_create_response_from_fd (strlen (TESTSTR), fd);
@@ -485,7 +485,7 @@
   if (errorCount != 0)
     fprintf (stderr, "Error (code: %u)\n", errorCount);
   curl_global_cleanup ();
-  UNLINK (sourcefile);
+  unlink (sourcefile);
   free (sourcefile);
   return errorCount != 0;       /* 0 == pass */
 }
--- ../SOURCES/libmicrohttpd-0.9.27/src/testcurl/perf_get.c	2013-03-31 13:34:40.000000000 -0500
+++ libmicrohttpd-0.9.27/src/testcurl/perf_get.c	2013-08-07 11:01:57.112646473 -0500
@@ -82,7 +82,7 @@
 {
   struct timeval tv;
 
-  GETTIMEOFDAY (&tv, NULL);
+  gettimeofday (&tv, NULL);
   return (((unsigned long long) tv.tv_sec * 1000LL) +
 	  ((unsigned long long) tv.tv_usec / 1000LL));
 }
--- ../SOURCES/libmicrohttpd-0.9.27/src/testcurl/test_post_loop.c	2012-10-08 15:55:12.000000000 -0500
+++ libmicrohttpd-0.9.27/src/testcurl/test_post_loop.c	2013-08-07 11:02:20.138857839 -0500
@@ -454,7 +454,7 @@
 {
   struct timeval tv;
 
-  GETTIMEOFDAY (&tv, NULL);
+  gettimeofday (&tv, NULL);
   return (((unsigned long long) tv.tv_sec * 1000LL) +
 	  ((unsigned long long) tv.tv_usec / 1000LL));
 }