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.

diff --git a/Include/longobject.h b/Include/longobject.h
index a8dace6cc3fb8c9a1f2912fd3eb5ed175a5b88ea..6adf2620d2d47ccd2696ed322ff381a4eaceb32f 100644 (file)
--- 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
-
 /* Issue #1983: pid_t can be longer than a C long on some systems */
 #if !defined(SIZEOF_PID_T) || SIZEOF_PID_T == SIZEOF_INT
 #define _Py_PARSE_PID "i"

diff --git a/Misc/NEWS b/Misc/NEWS
index ec515451bd5542e8472c663c4edd49002ff26e53..46d6fdd641bcb9138f3288e37db5689228f10166 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -74,6 +74,10 @@ Core and Builtins
 Extensions
 ----------
 
+- 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 #1027206: Support IDNA in gethostbyname, gethostbyname_ex, 
   getaddrinfo and gethostbyaddr. getnameinfo is now restricted to numeric
   addresses as input.

diff --git a/Modules/socketmodule.h b/Modules/socketmodule.h
index 49ac9d02a13536e2c2576bb9ae57ecd133bd3792..4f426f5d85c937b1f3ea2a3889b50c39b7a71568 100644 (file)
--- 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;