summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2013-06-04 21:56:38 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2013-06-04 21:56:38 (GMT)
commit7e91e771a9348dcc28a9bac1a321a3bc1e3cfda8 (patch)
tree58a234bbf976ff1b2b0e8632b9b13f7f8b04a0bb
parentfbf50d43da6fbbf10ac715df4e1ee54de1be4c08 (diff)
downloadcpython-7e91e771a9348dcc28a9bac1a321a3bc1e3cfda8.zip
cpython-7e91e771a9348dcc28a9bac1a321a3bc1e3cfda8.tar.gz
cpython-7e91e771a9348dcc28a9bac1a321a3bc1e3cfda8.tar.bz2
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).
-rw-r--r--Include/pyport.h4
-rw-r--r--Misc/NEWS4
-rw-r--r--PC/pyconfig.h3
3 files changed, 7 insertions, 4 deletions
diff --git a/Include/pyport.h b/Include/pyport.h
index 96e8f1a..eb1bbe2 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 ce7a248..a7e76f4 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 c5f16e5..8c4c7f3 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 */