mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-31 14:07:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

OS/2 EMX port changes (Modules part of patch #450267):

Browse source 
Modules/
    socketmodule.c

EMX handles sockets like Posix, rather than use native APIs
This commit is contained in:
Andrew MacIntyre 2002-03-03 03:03:52 +00:00
parent 7bf6833e17
commit ba43e8700b
1 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Modules/socketmodule.c
View file

@ -227,7 +227,7 @@ const char *inet_ntop(int af, const void *src, char *dst, socklen_t size);
# define snprintf _snprintf # define snprintf _snprintf
#endif #endif
#if defined(PYOS_OS2) #if defined(PYOS_OS2) && !defined(PYCC_GCC)
#define SOCKETCLOSE soclose #define SOCKETCLOSE soclose
#define NO_DUP /* Sockets are Not Actual File Handles under OS/2 */ #define NO_DUP /* Sockets are Not Actual File Handles under OS/2 */
#endif #endif
@ -352,7 +352,7 @@ PySocket_Err(void)
else else
#endif #endif
#if defined(PYOS_OS2) #if defined(PYOS_OS2) && !defined(PYCC_GCC)
if (sock_errno() != NO_ERROR) { if (sock_errno() != NO_ERROR) {
APIRET rc; APIRET rc;
ULONG msglen; ULONG msglen;
@ -931,7 +931,7 @@ PySocketSock_setblocking(PySocketSockObject *s, PyObject *arg)
#else #else
#ifndef RISCOS #ifndef RISCOS
#ifndef MS_WINDOWS #ifndef MS_WINDOWS
#ifdef PYOS_OS2 #if defined(PYOS_OS2) && !defined(PYCC_GCC)
block = !block; block = !block;
ioctl(s->sock_fd, FIONBIO, (caddr_t)&block, sizeof(block)); ioctl(s->sock_fd, FIONBIO, (caddr_t)&block, sizeof(block));
#else /* !PYOS_OS2 */ #else /* !PYOS_OS2 */
@ -1441,7 +1441,7 @@ PySocketSock_recvfrom(PySocketSockObject *s, PyObject *args)
memset(addrbuf, 0, addrlen); memset(addrbuf, 0, addrlen);
n = recvfrom(s->sock_fd, PyString_AS_STRING(buf), len, flags, n = recvfrom(s->sock_fd, PyString_AS_STRING(buf), len, flags,
#ifndef MS_WINDOWS #ifndef MS_WINDOWS
#if defined(PYOS_OS2) #if defined(PYOS_OS2) && !defined(PYCC_GCC)
(struct sockaddr *)addrbuf, &addrlen (struct sockaddr *)addrbuf, &addrlen
#else #else
(void *)addrbuf, &addrlen (void *)addrbuf, &addrlen
@ -2633,6 +2633,7 @@ OS2cleanup(void)
static int static int
OS2init(void) OS2init(void)
{ {
#if !defined(PYCC_GCC)
char reason[64]; char reason[64];
int rc = sock_init(); int rc = sock_init();
@ -2646,6 +2647,10 @@ OS2init(void)
PyErr_SetString(PyExc_ImportError, reason); PyErr_SetString(PyExc_ImportError, reason);
return 0; /* Indicate Failure */ return 0; /* Indicate Failure */
#else
/* no need to initialise sockets with GCC/EMX */
return 1;
#endif
} }
#endif /* PYOS_OS2 */ #endif /* PYOS_OS2 */
@ -2695,10 +2700,10 @@ init_socket(void)
if (!NTinit()) if (!NTinit())
return; return;
#else #else
#if defined(__TOS_OS2__) #if defined(PYOS_OS2)
if (!OS2init()) if (!OS2init())
return; return;
#endif /* __TOS_OS2__ */ #endif /* PYOS_OS2 */
#endif /* MS_WINDOWS */ #endif /* MS_WINDOWS */
#endif /* RISCOS */ #endif /* RISCOS */
PySocketSock_Type.ob_type = &PyType_Type; PySocketSock_Type.ob_type = &PyType_Type;