[Python-checkins] python/dist/src/Modules socketmodule.c, 1.274, 1.275

Sat Oct 4 04:00:52 EDT 2003

Update of /cvsroot/python/python/dist/src/Modules
In directory sc8-pr-cvs1:/tmp/cvs-serv20395
Modified Files:
	socketmodule.c 
Log Message:
made the SGI INET_ADDRSTRLEN define apply for any compiler on Irix. Both the
SGI compiler and GCC seem to need this.
Index: socketmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/socketmodule.c,v
retrieving revision 1.274
retrieving revision 1.275
diff -C2 -d -r1.274 -r1.275
*** socketmodule.c	3 Oct 2003 13:56:20 -0000	1.274
--- socketmodule.c	4 Oct 2003 08:00:49 -0000	1.275
***************
*** 195,204 ****
 #define _SGIAPI 1
 
- #ifndef ENABLE_IPV6
- #define INET_ADDRSTRLEN 16
- #endif
- 
 #define HAVE_INET_PTON
 #include <netdb.h>
 #endif
 
--- 195,207 ----
 #define _SGIAPI 1
 
 #define HAVE_INET_PTON
 #include <netdb.h>
+ #endif
+ 
+ /* Irix 6.5 fails to define this variable at all. This is needed 
+ for both GCC and SGI's compiler. I'd say that the SGI headers 
+ are just busted. */
+ #if defined(__sgi) && !defined(INET_ADDRSTRLEN)
+ #define INET_ADDRSTRLEN 16
 #endif