--- libcoro/coro.c	2006/10/26 05:20:47	1.20
+++ libcoro/coro.c	2007/02/12 15:56:46	1.24
@@ -100,9 +100,9 @@
 #endif
 
 /* initialize a machine state */
-void coro_create(coro_context *ctx,
-                 coro_func coro, void *arg,
-                 void *sptr, long ssize)
+void coro_create (coro_context *ctx,
+                  coro_func coro, void *arg,
+                  void *sptr, long ssize)
 {
 #if CORO_UCONTEXT
 
@@ -142,7 +142,10 @@
   nsa.sa_flags = SA_ONSTACK;
 
   if (sigaction (SIGUSR2, &nsa, &osa))
-    perror ("sigaction");
+    {
+      perror ("sigaction");
+      abort ();
+    }
 
   /* set the new stack */
   nstk.ss_sp    = STACK_ADJUST_PTR (sptr,ssize); /* yes, some platforms (IRIX) get this wrong. */
@@ -150,7 +153,10 @@
   nstk.ss_flags = 0;
 
   if (sigaltstack (&nstk, &ostk) < 0)
-    perror ("sigaltstack");
+    {
+      perror ("sigaltstack");
+      abort ();
+    }
 
   trampoline_count = 0;
   kill (getpid (), SIGUSR2);
@@ -178,26 +184,37 @@
 # elif CORO_LOSER
 
   setjmp (ctx->env);
+#if __CYGWIN__
   ctx->env[7] = (long)((char *)sptr + ssize);
   ctx->env[8] = (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);
+#elif defined(_M_AMD64)
+  ((_JUMP_BUFFER *)&ctx->env)->Rip   = (__int64)coro_init;
+  ((_JUMP_BUFFER *)&ctx->env)->Rsp   = (__int64)STACK_ADJUST_PTR (sptr,ssize);
+#elif defined(_M_IA64)
+  ((_JUMP_BUFFER *)&ctx->env)->StIIP = (__int64)coro_init;
+  ((_JUMP_BUFFER *)&ctx->env)->IntSp = (__int64)STACK_ADJUST_PTR (sptr,ssize);
+#else
+#error "microsoft libc or architecture not supported"
+#endif
 
 # elif CORO_LINUX
 
-  setjmp (ctx->env);
-#if defined(__GLIBC__) && defined(__GLIBC_MINOR__) \
-    && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 0 && defined(JB_PC) && defined(JB_SP)
+  _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);
-#elif defined(__GLIBC__) && defined(__GLIBC_MINOR__) \
-    && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 0 && defined(__mc68000__)
+  ctx->env[0].__jmpbuf[JB_SP] = (long)STACK_ADJUST_PTR (sptr, ssize);
+#elif __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 0 && defined (__mc68000__)
   ctx->env[0].__jmpbuf[0].__aregs[0] = (long int)coro_init;
   ctx->env[0].__jmpbuf[0].__sp = (int *)((char *)sptr + ssize);
-#elif defined(__GNU_LIBRARY__) && defined(__i386__)
+#elif defined (__GNU_LIBRARY__) && defined (__i386__)
   ctx->env[0].__jmpbuf[0].__pc = (char *)coro_init;
   ctx->env[0].__jmpbuf[0].__sp = (void *)((char *)sptr + ssize);
-#elif defined(__GNU_LIBRARY__) && defined(__amd64__)
+#elif defined (__GNU_LIBRARY__) && defined (__amd64__)
   ctx->env[0].__jmpbuf[JB_PC]  = (long)coro_init;
-  ctx->env[0].__jmpbuf[JB_RSP] = (long)STACK_ADJUST_PTR (sptr,ssize);
+  ctx->env[0].__jmpbuf[JB_RSP] = (long)STACK_ADJUST_PTR (sptr, ssize);
 #else
 #error "linux libc or architecture not supported"
 #endif
@@ -206,7 +223,7 @@
 
   setjmp (ctx->env);
   ctx->env[JB_PC] = (__uint64_t)coro_init;
-  ctx->env[JB_SP] = (__uint64_t)STACK_ADJUST_PTR (sptr,ssize);
+  ctx->env[JB_SP] = (__uint64_t)STACK_ADJUST_PTR (sptr, ssize);
 
 # endif