From: Victor Stinner <victor.stinner@gmail.com>
Date: Tue, 4 Jun 2013 21:56:38 +0000 (+0200)
Subject: Close #17931: Fix PyLong_FromPid() on Windows 64-bit: processes are identified
X-Git-Tag: v3.4.0a1~576
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7e91e771a9348dcc28a9bac1a321a3bc1e3cfda8;p=thirdparty%2FPython%2Fcpython.git

Close #17931: Fix PyLong_FromPid() on Windows 64-bit: processes are identified
by their HANDLE which is a pointer (and not a long, which is smaller).
---

diff --git a/Include/pyport.h b/Include/pyport.h
index 96e8f1a5f86d..eb1bbe20ec60 100644
--- a/Include/pyport.h
+++ b/Include/pyport.h
@@ -219,10 +219,6 @@ typedef size_t Py_uhash_t;
 /* Smallest negative value of type Py_ssize_t. */
 #define PY_SSIZE_T_MIN (-PY_SSIZE_T_MAX-1)
 
-#if SIZEOF_PID_T > SIZEOF_LONG
-#   error "Python doesn't support sizeof(pid_t) > sizeof(long)"
-#endif
-
 /* PY_FORMAT_SIZE_T is a platform-specific modifier for use in a printf
  * format to convert an argument with the width of a size_t or Py_ssize_t.
  * C99 introduced "z" for this purpose, but not all platforms support that;
diff --git a/Misc/NEWS b/Misc/NEWS
index ce7a2485fbab..a7e76f4b7a50 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,10 @@ What's New in Python 3.4.0 Alpha 1?
 Core and Builtins
 -----------------
 
+- Issue #17931: Fix PyLong_FromPid() on Windows 64-bit: processes are
+  identified by their HANDLE which is a pointer (and not a long, which is
+  smaller).
+
 - Tweak the exception message when the magic number or size value in a bytecode
   file is truncated.
 
diff --git a/PC/pyconfig.h b/PC/pyconfig.h
index c5f16e580ff8..8c4c7f3fa5a3 100644
--- a/PC/pyconfig.h
+++ b/PC/pyconfig.h
@@ -723,6 +723,9 @@ Py_NO_ENABLE_SHARED to find out.  Also support MS_NO_COREDLL for b/w compat */
 /* The size of `wchar_t', as computed by sizeof. */
 #define SIZEOF_WCHAR_T 2
 
+/* The size of `pid_t' (HANDLE). */
+#define SIZEOF_PID_T SIZEOF_VOID_P
+
 /* Define if you have the dl library (-ldl).  */
 /* #undef HAVE_LIBDL */