--- libcoro/coro.h	2008/11/08 04:52:01	1.34
+++ libcoro/coro.h	2010/07/27 14:42:34	1.43
@@ -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:
@@ -65,11 +65,19 @@
  *            do not rely on makecontext passing a void * correctly.
  *            try harder to get _setjmp/_longjmp.
  *            major code cleanup/restructuring.
+ * 2008-11-10 the .cfi hacks are no longer needed.
+ * 2008-11-16 work around a freebsd pthread bug.
+ * 2008-11-19 define coro_*jmp symbols for easier porting.
+ * 2009-06-23 tentative win32-backend support for mingw32 (Yasuhiro Matsumoto).
  */
 
 #ifndef CORO_H
 #define CORO_H
 
+#if __cplusplus
+extern "C" {
+#endif
+
 #define CORO_VERSION 2
 
 /*
@@ -116,11 +124,13 @@
  * -DCORO_ASM
  *
  *    Handcoded assembly, known to work only on a few architectures/ABI:
- *    ELF Linux x86 && amd64 when gcc is used and optimisation is turned on.
+ *    GCC + x86/IA32 and amd64/x86_64 + GNU/Linux and a few BSDs.
  *
  * -DCORO_PTHREAD
  *
  *    Use the pthread API. You have to provide <pthread.h> and -lpthread.
+ *    This is likely the slowest backend, and it also does not support fork(),
+ *    so avoid it at all costs.
  *
  * If you define neither of these symbols, coro.h will try to autodetect
  * the model. This currently works for CORO_LOSER only. For the other
@@ -148,7 +158,7 @@
  * Allocating/deallocating the stack is your own responsibility.
  *
  * As a special case, if coro, arg, sptr and ssize are all zero,
- * then an "empty" coro_contetx will be created that is suitable
+ * then an "empty" coro_context will be created that is suitable
  * as an initial source for coro_transfer.
  *
  * This function is not reentrant, but putting a mutex around it
@@ -173,7 +183,9 @@
 /*
  * The following prototype defines the coroutine destroy function. It is
  * usually implemented as a macro, so watch out. It also serves
- * no purpose unless you want to use the CORO_PTHREAD backend.
+ * no purpose unless you want to use the CORO_PTHREAD backend,
+ * where it is used to clean up the thread. You are responsible
+ * for freeing the stack and the context itself.
  *
  * This function is thread-safe and reentrant.
  */
@@ -227,20 +239,33 @@
 #  include <unistd.h>
 # endif
 
-# include <setjmp.h>
+/* solaris is hopelessly borked, it expands _XOPEN_UNIX to nothing */
+# if __sun
+#  undef _XOPEN_UNIX
+#  define _XOPEN_UNIX 1
+# endif
 
-struct coro_context {
-  jmp_buf env;
-};
+# include <setjmp.h>
 
-# if _XOPEN_UNIX > 0
-#  define coro_transfer(p,n) do { if (!  _setjmp ((p)->env   ))   _longjmp ((n)->env, 1); } while (0)
+# if _XOPEN_UNIX > 0 || defined (_setjmp)
+#  define coro_jmp_buf      jmp_buf
+#  define coro_setjmp(env)  _setjmp (env)
+#  define coro_longjmp(env) _longjmp ((env), 1)
 # elif CORO_LOSER
-#  define coro_transfer(p,n) do { if (!   setjmp ((p)->env   ))    longjmp ((n)->env, 1); } while (0)
+#  define coro_jmp_buf      jmp_buf
+#  define coro_setjmp(env)  setjmp (env)
+#  define coro_longjmp(env) longjmp ((env), 1)
 # else
-#  define coro_transfer(p,n) do { if (!sigsetjmp ((p)->env, 0)) siglongjmp ((n)->env, 1); } while (0)
+#  define coro_jmp_buf      sigjmp_buf
+#  define coro_setjmp(env)  sigsetjmp (env, 0)
+#  define coro_longjmp(env) siglongjmp ((env), 1)
 # endif
 
+struct coro_context {
+  coro_jmp_buf env;
+};
+
+# define coro_transfer(p,n) do { if (!coro_setjmp ((p)->env)) coro_longjmp ((n)->env); } while (0)
 # define coro_destroy(ctx) (void *)(ctx)
 
 #elif CORO_ASM
@@ -270,5 +295,9 @@
 
 #endif
 
+#if __cplusplus
+}
+#endif
+
 #endif