From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: Jan Nieuwenhuizen Newsgroups: gmane.lisp.guile.devel Subject: Re: [PATCH]: Cross building and Cygwin fixes. Date: Wed, 10 Jul 2002 02:37:44 +0200 Organization: Jan at Appel Sender: guile-devel-admin@gnu.org Message-ID: <87u1n8s9if.fsf@peder.flower> References: <87r8ikdbj6.fsf@peder.flower> <87hejb6ztn.fsf@zagadka.ping.de> <87eleebl6u.fsf@peder.flower> <87y9ckdbao.fsf@zagadka.ping.de> NNTP-Posting-Host: localhost.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: main.gmane.org 1026261462 13017 127.0.0.1 (10 Jul 2002 00:37:42 GMT) X-Complaints-To: usenet@main.gmane.org NNTP-Posting-Date: Wed, 10 Jul 2002 00:37:42 +0000 (UTC) Cc: guile-devel@gnu.org, Han-Wen Return-path: Original-Received: from fencepost.gnu.org ([199.232.76.164]) by main.gmane.org with esmtp (Exim 3.33 #1 (Debian)) id 17S5UD-0003Nq-00 for ; Wed, 10 Jul 2002 02:37:41 +0200 Original-Received: from localhost ([127.0.0.1] helo=fencepost.gnu.org) by fencepost.gnu.org with esmtp (Exim 3.35 #1 (Debian)) id 17S5Ub-0007EK-00; Tue, 09 Jul 2002 20:38:05 -0400 Original-Received: from node-d-3053.a2000.nl ([62.195.48.83] helo=peder.flower) by fencepost.gnu.org with esmtp (Exim 3.35 #1 (Debian)) id 17S5UK-0007Dv-00 for ; Tue, 09 Jul 2002 20:37:48 -0400 Original-Received: from localhost.localdomain ([127.0.0.1] helo=peder.flower) by peder.flower with esmtp (Exim 3.35 #1 (Debian)) id 17S5UH-0003La-00; Wed, 10 Jul 2002 02:37:45 +0200 Original-To: Marius Vollmer In-Reply-To: <87y9ckdbao.fsf@zagadka.ping.de> (Marius Vollmer's message of "09 Jul 2002 20:08:15 +0200") Original-Lines: 132 User-Agent: Gnus/5.090006 (Oort Gnus v0.06) Emacs/21.2 (i386-debian-linux-gnu) Errors-To: guile-devel-admin@gnu.org X-BeenThere: guile-devel@gnu.org X-Mailman-Version: 2.0.11 Precedence: bulk List-Help: List-Post: List-Subscribe: , List-Id: Developers list for Guile, the GNU extensibility library List-Unsubscribe: , List-Archive: Xref: main.gmane.org gmane.lisp.guile.devel:771 X-Report-Spam: http://spam.gmane.org/gmane.lisp.guile.devel:771 Marius Vollmer writes: >> Possibly. But then it's not a HAVE_WINSOCK2, but rather a >> WANT_WINSOCK2. If configure.in only changes 'have' into want if not >> Cygwin, that would maybe be cleaner. > > Yes. Can you provide a patch? I would, but there seems to be some confusion about Guile's cvs setup, at my part. The patch I sent, was [meant to be applied] against 02:24:51 fred@peder:~/cvs/guile/guile-core-1.6 $ cat CVS/Tag Tbranch_release-1-6 However, I found it applied to HEAD, that identifies itself as 1.7.0. Now, I realise that the version should be partly ignored, but I had the impression that there would be a stable, 1.6 branch, that would produce 1.6.x releases. Is there somewhere else I should look? Anyway, thanks a lot for applying the patch, most is of it is very helpful for Cygwin and cross building. But as it turns out, for HEAD, where it got applied, some was superfluous. In configure.in, I already found: if test "$MINGW32" = "yes" ; then AC_CHECK_HEADER(winsock2.h, [AC_DEFINE([HAVE_WINSOCK2_H], 1, etc, so that looks ok. I've tested HEAD with the patch below, and it indeed builds fine. Also, I found that some #include statements are still inside #ifdef __MINGW32__ (fports.c, inet_aton.c). It doesn't do any harm, but you may want to put them inside #ifdef HAVE_WINSOCK2_H now. Thanks again, Jan. Index: libguile/guile.c =================================================================== RCS file: /cvsroot/guile/guile/guile-core/libguile/guile.c,v retrieving revision 1.11 diff -p -u -r1.11 guile.c --- libguile/guile.c 7 Jul 2002 19:58:15 -0000 1.11 +++ libguile/guile.c 10 Jul 2002 00:30:19 -0000 @@ -58,8 +58,7 @@ #include #endif -#if defined (HAVE_WINSOCK2_H) \ - && !(defined (__CYGWIN32__) || defined (__CYGWIN__)) +#ifdef HAVE_WINSOCK2_H #include #endif Index: libguile/iselect.h =================================================================== RCS file: /cvsroot/guile/guile/guile-core/libguile/iselect.h,v retrieving revision 1.13 diff -p -u -r1.13 iselect.h --- libguile/iselect.h 7 Jul 2002 19:58:15 -0000 1.13 +++ libguile/iselect.h 10 Jul 2002 00:30:19 -0000 @@ -68,8 +68,7 @@ #include #endif -#if defined (HAVE_WINSOCK2_H) \ - && !(defined (__CYGWIN32__) || defined (__CYGWIN__)) +#if HAVE_WINSOCK2_H #include #endif Index: libguile/net_db.c =================================================================== RCS file: /cvsroot/guile/guile/guile-core/libguile/net_db.c,v retrieving revision 1.69 diff -p -u -r1.69 net_db.c --- libguile/net_db.c 7 Jul 2002 19:58:15 -0000 1.69 +++ libguile/net_db.c 10 Jul 2002 00:30:19 -0000 @@ -65,8 +65,7 @@ #include -#if defined (HAVE_WINSOCK2_H) \ - && !(defined (__CYGWIN32__) || defined (__CYGWIN__)) +#ifdef HAVE_WINSOCK2_H #include #else #include Index: libguile/posix.c =================================================================== RCS file: /cvsroot/guile/guile/guile-core/libguile/posix.c,v retrieving revision 1.105 diff -p -u -r1.105 posix.c --- libguile/posix.c 7 Jul 2002 19:58:15 -0000 1.105 +++ libguile/posix.c 10 Jul 2002 00:30:20 -0000 @@ -96,8 +96,7 @@ extern char *ttyname(); #ifdef HAVE_IO_H #include #endif -#if defined (HAVE_WINSOCK2_H) \ - && !(defined (__CYGWIN32__) || defined (__CYGWIN__)) +#ifdef HAVE_WINSOCK2_H #include #endif Index: libguile/socket.c =================================================================== RCS file: /cvsroot/guile/guile/guile-core/libguile/socket.c,v retrieving revision 1.87 diff -p -u -r1.87 socket.c --- libguile/socket.c 7 Jul 2002 19:58:15 -0000 1.87 +++ libguile/socket.c 10 Jul 2002 00:30:21 -0000 @@ -68,8 +68,7 @@ #include #endif #include -#if defined (HAVE_WINSOCK2_H) \ - && !(defined (__CYGWIN32__) || defined (__CYGWIN__)) +#ifdef HAVE_WINSOCK2_H #include #else #include -- Jan Nieuwenhuizen | GNU LilyPond - The music typesetter http://www.xs4all.nl/~jantien | http://www.lilypond.org _______________________________________________ Guile-devel mailing list Guile-devel@gnu.org http://mail.gnu.org/mailman/listinfo/guile-devel