[Python-Dev] Re: [Python-checkins] python/dist/src/Modules socketmodule.c, 1.304, 1.305

[Trent Mick]

The log message for that was supposed to be:

    Apply patch from http://python.org/sf/728330 to fix socket module
    compilation on Solaris 2.6, HP-UX 11, AIX 5.1 and (possibly) some
    IRIX versions.

but "cvs" surprised me with its wonderful and clear UI for specifying
the log message. Can the cvs logs be updated after the fact?

Trent


[tmick at users.sourceforge.net wrote]
> Update of /cvsroot/python/python/dist/src/Modules
> In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10162
> 
> Modified Files:
> 	socketmodule.c 
> Log Message:
> 
> 
> Index: socketmodule.c
> ===================================================================
> RCS file: /cvsroot/python/python/dist/src/Modules/socketmodule.c,v
> retrieving revision 1.304
> retrieving revision 1.305
> diff -u -d -r1.304 -r1.305
> --- socketmodule.c	26 Aug 2004 00:51:16 -0000	1.304
> +++ socketmodule.c	7 Sep 2004 17:48:26 -0000	1.305
> @@ -257,7 +257,19 @@
>  # define O_NONBLOCK O_NDELAY
>  #endif
>  
> -#include "addrinfo.h"
> +/* include Python's addrinfo.h unless it causes trouble */
> +#if defined(__sgi) && _COMPILER_VERSION>700 && defined(_SS_ALIGNSIZE)
> +  /* Do not include addinfo.h on some newer IRIX versions.
> +   * _SS_ALIGNSIZE is defined in sys/socket.h by 6.5.21,
> +   * for example, but not by 6.5.10.
> +   */
> +#elif defined(_MSC_VER) && _MSC_VER>1200
> +  /* Do not include addrinfo.h for MSVC7 or greater. 'addrinfo' and
> +   * EAI_* constants are defined in (the already included) ws2tcpip.h.
> +   */
> +#else
> +#  include "addrinfo.h"
> +#endif
>  
>  #ifndef HAVE_INET_PTON
>  int inet_pton(int af, const char *src, void *dst);
> 
> _______________________________________________
> Python-checkins mailing list
> Python-checkins at python.org
> http://mail.python.org/mailman/listinfo/python-checkins

-- 
Trent Mick
TrentM at ActiveState.com