[Python-checkins] python/dist/src/Modules socketmodule.c, 1.271.6.3, 1.271.6.4

[anthonybaxter at users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Modules
In directory sc8-pr-cvs1:/tmp/cvs-serv13660

Modified Files:
      Tag: release23-maint
	socketmodule.c 
Log Message:
made the SGI INET_ADDRSTRLEN 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.271.6.3
retrieving revision 1.271.6.4
diff -C2 -d -r1.271.6.3 -r1.271.6.4
*** socketmodule.c	3 Oct 2003 13:55:37 -0000	1.271.6.3
--- socketmodule.c	4 Oct 2003 06:55:33 -0000	1.271.6.4
***************
*** 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