--- libcoro/coro.c	2008/11/10 04:37:23	1.42
+++ libcoro/coro.c	2009/07/11 14:24:13	1.46
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001-2008 Marc Alexander Lehmann <schmorp@schmorp.de>
+ * Copyright (c) 2001-2009 Marc Alexander Lehmann <schmorp@schmorp.de>
  * 
  * Redistribution and use in source and binary forms, with or without modifica-
  * tion, are permitted provided that the following conditions are met:
@@ -102,15 +102,8 @@
 static void
 trampoline (int sig)
 {
-  if (
-    #if _XOPEN_UNIX > 0
-      _setjmp (new_coro->env)
-    #else
-      sigsetjmp (new_coro->env, 0)
-    #endif
-  ) {
-      coro_init (); /* start it */
-    }
+  if (coro_setjmp (new_coro->env))
+    coro_init (); /* start it */
   else
     trampoline_done = 1;
 }
@@ -231,10 +224,13 @@
 
 # elif CORO_LOSER
 
-  setjmp (ctx->env);
+  coro_setjmp (ctx->env);
   #if __CYGWIN__
     ctx->env[7] = (long)((char *)sptr + ssize) - sizeof (long);
     ctx->env[8] = (long)coro_init;
+  #elif defined(__MINGW32__)
+    ctx->env[4] = (long)((char *)sptr + ssize) - sizeof (long);
+    ctx->env[5] = (long)coro_init;
   #elif defined(_M_IX86)
     ((_JUMP_BUFFER *)&ctx->env)->Eip   = (long)coro_init;
     ((_JUMP_BUFFER *)&ctx->env)->Esp   = (long)STACK_ADJUST_PTR (sptr, ssize) - sizeof (long);
@@ -250,7 +246,7 @@
 
 # elif CORO_LINUX
 
-  _setjmp (ctx->env);
+  coro_setjmp (ctx->env);
   #if __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 0 && defined (JB_PC) && defined (JB_SP)
     ctx->env[0].__jmpbuf[JB_PC] = (long)coro_init;
     ctx->env[0].__jmpbuf[JB_SP] = (long)STACK_ADJUST_PTR (sptr, ssize) - sizeof (long);
@@ -269,7 +265,7 @@
 
 # elif CORO_IRIX
 
-  sigsetjmp (ctx->env, 0);
+  coro_setjmp (ctx->env, 0);
   ctx->env[JB_PC] = (__uint64_t)coro_init;
   ctx->env[JB_SP] = (__uint64_t)STACK_ADJUST_PTR (sptr, ssize) - sizeof (long);
 
@@ -343,6 +339,9 @@
 {
   pthread_cond_signal (&next->cv);
   pthread_cond_wait (&prev->cv, &coro_mutex);
+#if __FreeBSD__ /* freebsd is of course broken and needs manual testcancel calls... yay... */
+  pthread_testcancel ();
+#endif
 }
 
 void