[Python-checkins] CVS: python/dist/src/Modules socketmodule.c,1.209,1.210

[Andrew I MacIntyre]

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

Modified Files:
	socketmodule.c 
Log Message:
OS/2 EMX port changes (Modules part of patch #450267):
  Modules/
    socketmodule.c

EMX handles sockets like Posix, rather than use native APIs


Index: socketmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/socketmodule.c,v
retrieving revision 1.209
retrieving revision 1.210
diff -C2 -d -r1.209 -r1.210
*** socketmodule.c	1 Mar 2002 08:31:07 -0000	1.209
--- socketmodule.c	3 Mar 2002 03:03:52 -0000	1.210
***************
*** 228,232 ****
  #endif
  
! #if defined(PYOS_OS2)
  #define SOCKETCLOSE soclose
  #define NO_DUP /* Sockets are Not Actual File Handles under OS/2 */
--- 228,232 ----
  #endif
  
! #if defined(PYOS_OS2) && !defined(PYCC_GCC)
  #define SOCKETCLOSE soclose
  #define NO_DUP /* Sockets are Not Actual File Handles under OS/2 */
***************
*** 353,357 ****
  #endif
  
! #if defined(PYOS_OS2)
      if (sock_errno() != NO_ERROR) {
          APIRET rc;
--- 353,357 ----
  #endif
  
! #if defined(PYOS_OS2) && !defined(PYCC_GCC)
      if (sock_errno() != NO_ERROR) {
          APIRET rc;
***************
*** 932,936 ****
  #ifndef RISCOS
  #ifndef MS_WINDOWS
! #ifdef PYOS_OS2
  	block = !block;
  	ioctl(s->sock_fd, FIONBIO, (caddr_t)&block, sizeof(block));
--- 932,936 ----
  #ifndef RISCOS
  #ifndef MS_WINDOWS
! #if defined(PYOS_OS2) && !defined(PYCC_GCC)
  	block = !block;
  	ioctl(s->sock_fd, FIONBIO, (caddr_t)&block, sizeof(block));
***************
*** 1442,1446 ****
  	n = recvfrom(s->sock_fd, PyString_AS_STRING(buf), len, flags,
  #ifndef MS_WINDOWS
! #if defined(PYOS_OS2)
  		     (struct sockaddr *)addrbuf, &addrlen
  #else
--- 1442,1446 ----
  	n = recvfrom(s->sock_fd, PyString_AS_STRING(buf), len, flags,
  #ifndef MS_WINDOWS
! #if defined(PYOS_OS2) && !defined(PYCC_GCC)
  		     (struct sockaddr *)addrbuf, &addrlen
  #else
***************
*** 2634,2637 ****
--- 2634,2638 ----
  OS2init(void)
  {
+ #if !defined(PYCC_GCC)
      char reason[64];
      int rc = sock_init();
***************
*** 2647,2650 ****
--- 2648,2655 ----
  
      return 0;  /* Indicate Failure */
+ #else
+     /* no need to initialise sockets with GCC/EMX */
+     return 1;
+ #endif
  }
  
***************
*** 2696,2703 ****
  		return;
  #else
! #if defined(__TOS_OS2__)
  	if (!OS2init())
  		return;
! #endif /* __TOS_OS2__ */
  #endif /* MS_WINDOWS */
  #endif /* RISCOS */
--- 2701,2708 ----
  		return;
  #else
! #if defined(PYOS_OS2)
  	if (!OS2init())
  		return;
! #endif /* PYOS_OS2 */
  #endif /* MS_WINDOWS */
  #endif /* RISCOS */