From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 5580 invoked by alias); 6 Apr 2003 23:55:38 -0000 Mailing-List: contact guile-gtk-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: guile-gtk-owner@sources.redhat.com Received: (qmail 5571 invoked from network); 6 Apr 2003 23:55:37 -0000 Received: from unknown (HELO snoopy.pacific.net.au) (61.8.0.36) by sources.redhat.com with SMTP; 6 Apr 2003 23:55:37 -0000 Received: from sunny.pacific.net.au (sunny.pacific.net.au [203.2.228.40]) by snoopy.pacific.net.au (8.12.3/8.12.3/Debian-5) with ESMTP id h36NtY0p018945 for ; Mon, 7 Apr 2003 09:55:35 +1000 Received: from wisma.pacific.net.au (wisma.pacific.net.au [210.23.129.72]) by sunny.pacific.net.au with ESMTP id h36NtYid000192 for ; Mon, 7 Apr 2003 09:55:34 +1000 (EST) Received: from localhost (ppp57.dyn228.pacific.net.au [203.143.228.57]) by wisma.pacific.net.au (8.12.8/8.12.8) with ESMTP id h36NtWqn006649 for ; Mon, 7 Apr 2003 09:55:32 +1000 (EST) Received: from gg by localhost with local (Exim 3.35 #1 (Debian)) id 192JyQ-0000Pd-00; Mon, 07 Apr 2003 09:54:54 +1000 To: guile-gtk@sources.redhat.com Subject: gtk-thread.c and latest guile From: Kevin Ryde Mail-Copies-To: never Date: Sun, 06 Apr 2003 23:55:00 -0000 Message-ID: <87r88f6v1v.fsf@zip.com.au> User-Agent: Gnus/5.090017 (Oort Gnus v0.17) Emacs/21.2 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-SW-Source: 2003-q2/txt/msg00008.txt.bz2 --=-=-= Content-length: 255 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. --=-=-= Content-Disposition: attachment; filename=gtk-threads.c.new-configs.diff Content-length: 981 --- 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 --=-=-=--