Index: testsuite/boehm-gc.c/thread_leak_test.c
===================================================================
--- testsuite/boehm-gc.c/thread_leak_test.c	(revision 184568)
+++ testsuite/boehm-gc.c/thread_leak_test.c	(working copy)
@@ -1,13 +1,17 @@
-#define GC_LINUX_THREADS
+
+#ifndef GC_THREADS
+# define GC_THREADS
+#endif
+
 #include "leak_detector.h"
+
 #include <pthread.h>
+
 #include <stdio.h>
 
 void * test(void * arg) {
     int *p[10];
     int i;
-    GC_find_leak = 1; /* for new collect versions not compiled  */
-    /* with -DFIND_LEAK.                                        */
     for (i = 0; i < 10; ++i) {
         p[i] = malloc(sizeof(int)+i);
     }
@@ -15,25 +19,53 @@ void * test(void * arg) {
     for (i = 1; i < 10; ++i) {
         free(p[i]);
     }
-}       
+#   ifdef GC_PTHREADS
+      return arg;
+#   else
+      return (DWORD)(GC_word)arg;
+#   endif
+}
 
 #define NTHREADS 5
 
-int main() {
+int main(void) {
     int i;
-    pthread_t t[NTHREADS];
+#   ifdef GC_PTHREADS
+      pthread_t t[NTHREADS];
+#   else
+      HANDLE t[NTHREADS];
+      DWORD thread_id;
+#   endif
     int code;
 
+    GC_find_leak = 1; 
+                         /* with -DFIND_LEAK.                           */
+    GC_INIT();
+
     for (i = 0; i < NTHREADS; ++i) {
-	if ((code = pthread_create(t + i, 0, test, 0)) != 0) {
-    	    printf("Thread creation failed %d\n", code);
+#       ifdef GC_PTHREADS
+          code = pthread_create(t + i, 0, test, 0);
+#       else
+          t[i] = CreateThread(NULL, 0, test, 0, 0, &thread_id);
+          code = t[i] != NULL ? 0 : (int)GetLastError();
+#       endif
+        if (code != 0) {
+            printf("Thread creation failed %d\n", code);
         }
     }
+
     for (i = 0; i < NTHREADS; ++i) {
-	if ((code = pthread_join(t[i], 0)) != 0) {
-            printf("Thread join failed %lu\n", code);
+#       ifdef GC_PTHREADS
+          code = pthread_join(t[i], 0);
+#       else
+          code = WaitForSingleObject(t[i], INFINITE) == WAIT_OBJECT_0 ? 0 :
+                                                        (int)GetLastError();
+#       endif
+        if (code != 0) {
+            printf("Thread join failed %d\n", code);
         }
     }
+
     CHECK_LEAKS();
     CHECK_LEAKS();
     CHECK_LEAKS();