gtk-thread.c and latest guile

gtk-thread.c and latest guile

[Kevin Ryde]

[-- Attachment #1: Type: text/plain, Size: 255 bytes --]

The defines indicating what threading is supported have changed in the
latest cvs guile.  I get some joy from the following, at least enough
to build.

	* gtk-threads.c (SCM_USE_PTHREAD_THREADS, SCM_USE_COOP_THREADS):
	Recognise these from latest guile.


[-- Attachment #2: gtk-threads.c.new-configs.diff --]
[-- Type: text/plain, Size: 981 bytes --]

--- gtk-threads.c.~1.4.~	2002-12-28 07:23:25.000000000 +1000
+++ gtk-threads.c	2003-04-07 09:52:49.000000000 +1000
@@ -1,5 +1,5 @@
 /* Threading for guile-gtk
- * Copyright (C) 2000, 2002 Free Software Foundation
+ * Copyright (C) 2000, 2002, 2003 Free Software Foundation
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -32,6 +32,19 @@
 
 #include "gtk-threads.h"
 
+/* Guile 1.8 and up defines SCM_USE_PTHREAD_THREADS to 0 or 1, where
+   previously it was a define or not of USE_PTHREAD_THREADS.  Similarly
+   SCM_USE_COOP_THREADS and USE_COOP_THREADS.
+   FIXME: It might be better to reverse the code here to use the new style,
+   and recognise the old, rather than the other way around. */
+#if SCM_USE_PTHREAD_THREADS
+#define USE_PTHREAD_THREADS
+#endif
+#if SCM_USE_COOP_THREADS
+#define USE_COOP_THREADS
+#endif
+
+
 #ifdef USE_THREADS
 
 #ifndef USE_COOP_THREADS