[Python-checkins] python/dist/src/Modules socketmodule.c, 1.288, 1.289

[mwh at users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Modules
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5830

Modified Files:
	socketmodule.c 
Log Message:
Band-aid type fix for

[ 728330 ] Don't define _SGAPI on IRIX

The Right Thing would be nice, for now this'll do.  At least it isn't
going to break anything *other* than IRIX...


Index: socketmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/socketmodule.c,v
retrieving revision 1.288
retrieving revision 1.289
diff -C2 -d -r1.288 -r1.289
*** socketmodule.c	11 Apr 2004 12:02:25 -0000	1.288
--- socketmodule.c	26 May 2004 17:06:31 -0000	1.289
***************
*** 62,65 ****
--- 62,69 ----
  */
  
+ #if defined(__sgi) && _COMPILER_VERSION>700 && !_SGIAPI
+ #define _BSD_TYPES
+ #endif
+ 
  #include "Python.h"
  
***************
*** 193,198 ****
--- 197,212 ----
  /* XXX Using _SGIAPI is the wrong thing, 
     but I don't know what the right thing is. */
+ #undef _SGIAPI /* to avoid warning */
  #define _SGIAPI 1
  
+ #undef _XOPEN_SOURCE
+ #include <sys/socket.h>
+ #include <sys/types.h>
+ #include <netinet/in.h>
+ #ifdef _SS_ALIGNSIZE
+ #define HAVE_GETADDRINFO 1
+ #define HAVE_GETNAMEINFO 1
+ #endif
+ 
  #define HAVE_INET_PTON
  #include <netdb.h>
***************
*** 258,262 ****
--- 272,281 ----
  #endif
  
+ #if defined(__sgi) && _COMPILER_VERSION>700 \
+  && !defined(_SS_ALIGNSIZE) /* defined in sys/socket.h            */
+                             /* by some newer versions of IRIX     */
+                             /* (e.g. not by 6.5.10 but by 6.5.21) */
  #include "addrinfo.h"
+ #endif
  
  #ifndef HAVE_INET_PTON