*** empty log message ***

2 files changed, 45 insertions, 1 deletions

diff --git a/libguile/ChangeLog b/libguile/ChangeLog
index 13412c688..ed4dfe06b 100644
--- a/libguile/ChangeLog
+++ b/libguile/ChangeLog
@@ -1,3 +1,40 @@
+2000-06-06  Dirk Herrmann  <D.Herrmann@tu-bs.de>
+
+	* Makefile.am (noinst_HEADERS):  coop-threads.c coop-threads.h
+	coop.c are not considered part of guile's core any more.
+
+	(modinclude_HEADERS):  coop-defs.h no longer exists.
+
+	* __scm.h (SCM_THREAD_DEFER, SCM_THREAD_ALLOW, SCM_THREAD_REDEFER,
+	SCM_THREAD_SWITCHING_CODE, SCM_THREAD_SWITCH_COUNT):  Moved here
+	from threads.h.  These macros, however, may have to be updated in
+	order to be used with other thread packages than coop.
+
+	* coop.c:  Added code from iselect.c, made lots of definitions
+	static, made some definitions global.  The structure is not very
+	clean yet, especially the code from iselect.c could need some
+	better integration.
+
+	* coop.h:  Added.  Contains declarations from the former header
+	files coop-defs.h and coop-threads.h
+
+	* coop-defs.h, coop-threads.[ch]:  Removed.  The corresponding
+	code is partially in guile-coop.[ch] and coop.[ch].
+
+	* guile-coop.[ch]:  Added.  Contains glue code for the coop
+	threads implementation.  Some of the code is taken from
+	coop-defs.h and coop-threads.[ch].
+
+	* init.c:  No initialization code for iselect any more.
+
+	(scm_boot_guile_1):  Reordered some initialization functions.
+
+	* iselect.[ch]:  Moved almost everything to coop.[ch].  The rest
+	might probably go there as well.
+
+	* threads.[ch]:  Completely rewritten according to the new generic
+	threads interface as it was defined my Mikael Djurfeldt.
+
 2000-06-06  Marius Vollmer  <mvo@zagadka.ping.de>
 
 	* scmsigs.c (scm_sigaction): Silently ignore setting handlers for
@@ -38,7 +75,6 @@
 	validate.h (SCM_VALIDATE_BOOL_COPY, SCM_VALIDATE_PROC):  Replace
 	uses of SCM_TRUE_P (x) with SCM_EQ_P (x, SCM_BOOL_T).
 
->>>>>>> 1.990
 2000-06-04  Mikael Djurfeldt  <mdj@thalamus.nada.kth.se>
 
 	* eval.c (scm_badformalsp): New static function.
diff --git a/test-suite/ChangeLog b/test-suite/ChangeLog
index e0a92a011..ef4183374 100644
--- a/test-suite/ChangeLog
+++ b/test-suite/ChangeLog
@@ -1,3 +1,11 @@
+2000-06-06  Dirk Herrmann  <D.Herrmann@tu-bs.de>
+
+	* lib.scm (pass-if, expect-fail):  Generalized to allow a sequence
+	of expressions.
+
+	* tests/threads.test:  Added.  Does not check whether threads are
+	available and needs more test cases.
+
 2000-05-26  Dirk Herrmann  <D.Herrmann@tu-bs.de>
 
 	* tests/hooks.test:  make-hook-with-name is deprecated.