Mercurial > cpython-lru_cache-weakref
diff Modules/socketmodule.c @ 22115:d104bb50a194 legacy-trunk
OS/2 EMX port changes (Modules part of patch #450267):
Modules/
socketmodule.c
EMX handles sockets like Posix, rather than use native APIs
| author | Andrew MacIntyre <andymac@bullseye.apana.org.au> |
|---|---|
| date | Sun, 03 Mar 2002 03:03:52 +0000 |
| parents | 9e5ff6747437 |
| children | 0922c919cedb |
line wrap: on
line diff
--- a/Modules/socketmodule.c Sun Mar 03 02:59:16 2002 +0000 +++ b/Modules/socketmodule.c Sun Mar 03 03:03:52 2002 +0000 @@ -227,7 +227,7 @@ # define snprintf _snprintf #endif -#if defined(PYOS_OS2) +#if defined(PYOS_OS2) && !defined(PYCC_GCC) #define SOCKETCLOSE soclose #define NO_DUP /* Sockets are Not Actual File Handles under OS/2 */ #endif @@ -352,7 +352,7 @@ else #endif -#if defined(PYOS_OS2) +#if defined(PYOS_OS2) && !defined(PYCC_GCC) if (sock_errno() != NO_ERROR) { APIRET rc; ULONG msglen; @@ -931,7 +931,7 @@ #else #ifndef RISCOS #ifndef MS_WINDOWS -#ifdef PYOS_OS2 +#if defined(PYOS_OS2) && !defined(PYCC_GCC) block = !block; ioctl(s->sock_fd, FIONBIO, (caddr_t)&block, sizeof(block)); #else /* !PYOS_OS2 */ @@ -1441,7 +1441,7 @@ memset(addrbuf, 0, addrlen); n = recvfrom(s->sock_fd, PyString_AS_STRING(buf), len, flags, #ifndef MS_WINDOWS -#if defined(PYOS_OS2) +#if defined(PYOS_OS2) && !defined(PYCC_GCC) (struct sockaddr *)addrbuf, &addrlen #else (void *)addrbuf, &addrlen @@ -2633,6 +2633,7 @@ static int OS2init(void) { +#if !defined(PYCC_GCC) char reason[64]; int rc = sock_init(); @@ -2646,6 +2647,10 @@ PyErr_SetString(PyExc_ImportError, reason); return 0; /* Indicate Failure */ +#else + /* no need to initialise sockets with GCC/EMX */ + return 1; +#endif } #endif /* PYOS_OS2 */ @@ -2695,10 +2700,10 @@ if (!NTinit()) return; #else -#if defined(__TOS_OS2__) +#if defined(PYOS_OS2) if (!OS2init()) return; -#endif /* __TOS_OS2__ */ +#endif /* PYOS_OS2 */ #endif /* MS_WINDOWS */ #endif /* RISCOS */ PySocketSock_Type.ob_type = &PyType_Type;