Re: guile-1.6 Cygwin compile fixes

[Gerrit P. Haase]

Hallo Jan,

Am 2002-02-17 um 21:18 schriebst du:

> Now that a guile-1.6 release seemed imminent, I've tried to
> cross-compile it for Cygwin.  It seems that some mingw/plain windows
> enhancements broke the Cygwin compilation.

> I don't know much about these winsock includes and who needs it, but
> it seems a bit messy; there are two types of those:

>     #ifdef HAVE_WINSOCK2_H
>     #include <winsock2.h>

> and   

>     #ifdef __MINGW32__
>     #include <winsock2.h>

> I've changed (only) the first type, as that breaks for Cygwin, but
> maybe the first variant should be removed entirely in favour of the
> second, or the other way around (but then with fixes similar to patch
> below).
[snip]
> diff --exclude=*~ --exclude=#* --exclude=*.in --exclude=Makefile 
> --exclude=config* -purN ../guile-1.5.4/libguile/socket.c ./libguile/socket.c
> --- ../guile-1.5.4/libguile/socket.c    Tue Jul 10 13:28:54 2001
> +++ ./libguile/socket.c Sun Feb 17 19:31:34 2002
> @@ -61,7 +61,8 @@
>  #include <unistd.h>
>  #endif
>  #include <sys/types.h>
> -#ifdef HAVE_WINSOCK2_H
> +#if defined (HAVE_WINSOCK2_H) \
> +  && !(defined (__CYGWIN32__) || defined (__CYGWIN__))
>  #include <winsock2.h>
>  #else
>  #include <sys/socket.h>

It's enough to say:

#if defined(HAVE_WINSOCK2_H) && !defined(__CYGWIN__)


Gerrit
-- 
=^..^=                                        mailto:address@hidden