diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2010-08-28 20:53:24 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2010-08-28 20:53:24 (GMT) |
| commit | b440aec9f943a422b05353812be851100253d667 (patch) | |
| tree | 1a6d6d7658abc8b93ba6c6f661efde130cde2e28 | |
| parent | fcd2a7960c610c149eec66c16e999032457f47eb (diff) | |
| download | cpython-b440aec9f943a422b05353812be851100253d667.zip cpython-b440aec9f943a422b05353812be851100253d667.tar.gz cpython-b440aec9f943a422b05353812be851100253d667.tar.bz2 | |
Merged revisions 84347 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r84347 | antoine.pitrou | 2010-08-28 22:42:55 +0200 (sam., 28 août 2010) | 5 lines
Issue #4835: make PyLong_FromSocket_t() and PyLong_AsSocket_t() private
to the socket module, and fix the width of socket descriptors to be
correctly detected under 64-bit Windows.
........
| -rw-r--r-- | Include/longobject.h | 9 | ||||
| -rw-r--r-- | Misc/NEWS | 4 | ||||
| -rw-r--r-- | Modules/socketmodule.h | 8 |
3 files changed, 12 insertions, 9 deletions
diff --git a/Include/longobject.h b/Include/longobject.h index 28fb707..6e4e1a4 100644 --- a/Include/longobject.h +++ b/Include/longobject.h @@ -32,15 +32,6 @@ PyAPI_FUNC(PyObject *) PyLong_GetInfo(void); cleanup to keep the extra information. [CH] */ #define PyLong_AS_LONG(op) PyLong_AsLong(op) -/* Used by socketmodule.c */ -#if SIZEOF_SOCKET_T <= SIZEOF_LONG -#define PyLong_FromSocket_t(fd) PyLong_FromLong((SOCKET_T)(fd)) -#define PyLong_AsSocket_t(fd) (SOCKET_T)PyLong_AsLong(fd) -#else -#define PyLong_FromSocket_t(fd) PyLong_FromLongLong(((SOCKET_T)(fd)); -#define PyLong_AsSocket_t(fd) (SOCKET_T)PyLong_AsLongLong(fd) -#endif - /* For use by intobject.c only */ PyAPI_DATA(unsigned char) _PyLong_DigitValue[256]; @@ -463,6 +463,10 @@ Library Extension Modules ----------------- +- Issue #4835: make PyLong_FromSocket_t() and PyLong_AsSocket_t() private + to the socket module, and fix the width of socket descriptors to be + correctly detected under 64-bit Windows. + - Issue #665761: ``functools.reduce()`` will no longer mask exceptions other than ``TypeError`` raised by the iterator argument. diff --git a/Modules/socketmodule.h b/Modules/socketmodule.h index 49ac9d0..4f426f5 100644 --- a/Modules/socketmodule.h +++ b/Modules/socketmodule.h @@ -93,6 +93,14 @@ typedef int SOCKET_T; # define SIZEOF_SOCKET_T SIZEOF_INT #endif +#if SIZEOF_SOCKET_T <= SIZEOF_LONG +#define PyLong_FromSocket_t(fd) PyLong_FromLong((SOCKET_T)(fd)) +#define PyLong_AsSocket_t(fd) (SOCKET_T)PyLong_AsLong(fd) +#else +#define PyLong_FromSocket_t(fd) PyLong_FromLongLong((SOCKET_T)(fd)) +#define PyLong_AsSocket_t(fd) (SOCKET_T)PyLong_AsLongLong(fd) +#endif + /* Socket address */ typedef union sock_addr { struct sockaddr_in in; |