Re: [PATCH]: Cross building and Cygwin fixes.

[Jan Nieuwenhuizen]

Marius Vollmer <address@hidden> 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 address@hidden:~/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 <winsock2.h> 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 <libltdl/ltdl.h>
 #endif
 
-#if defined (HAVE_WINSOCK2_H) \
-  && !(defined (__CYGWIN32__) || defined (__CYGWIN__))
+#ifdef HAVE_WINSOCK2_H
 #include <winsock2.h>
 #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 <sys/select.h>
 #endif
 
-#if defined (HAVE_WINSOCK2_H) \
-  && !(defined (__CYGWIN32__) || defined (__CYGWIN__))
+#if HAVE_WINSOCK2_H
 #include <winsock2.h>
 #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 <sys/types.h>
 
-#if defined (HAVE_WINSOCK2_H) \
-  && !(defined (__CYGWIN32__) || defined (__CYGWIN__))
+#ifdef HAVE_WINSOCK2_H
 #include <winsock2.h>
 #else
 #include <sys/socket.h>
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 <io.h>
 #endif
-#if defined (HAVE_WINSOCK2_H) \
-  && !(defined (__CYGWIN32__) || defined (__CYGWIN__))
+#ifdef HAVE_WINSOCK2_H
 #include <winsock2.h>
 #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 <unistd.h>
 #endif
 #include <sys/types.h>
-#if defined (HAVE_WINSOCK2_H) \
-  && !(defined (__CYGWIN32__) || defined (__CYGWIN__))
+#ifdef HAVE_WINSOCK2_H
 #include <winsock2.h>
 #else
 #include <sys/socket.h>

           
-- 
Jan Nieuwenhuizen <address@hidden> | GNU LilyPond - The music typesetter
http://www.xs4all.nl/~jantien       | http://www.lilypond.org