diff options
| author | Tim Peters <tim.peters@gmail.com> | 2001-08-29 21:37:10 (GMT) |
|---|---|---|
| committer | Tim Peters <tim.peters@gmail.com> | 2001-08-29 21:37:10 (GMT) |
| commit | 79248aa1e4a8f6510b1f0ef95dc9592d51e16d6c (patch) | |
| tree | 8bdd40a12e1a9c279a7cd0741333a4a1e00c2bf6 /PC | |
| parent | 1936745668f44dd121b50fef31a70efc07cc4ebf (diff) | |
| download | cpython-79248aa1e4a8f6510b1f0ef95dc9592d51e16d6c.zip cpython-79248aa1e4a8f6510b1f0ef95dc9592d51e16d6c.tar.gz cpython-79248aa1e4a8f6510b1f0ef95dc9592d51e16d6c.tar.bz2 | |
SF bug [#456252] Python should never stomp on [u]intptr_t.
pyport.h: typedef a new Py_intptr_t type.
DELICATE ASSUMPTION: That HAVE_UINTPTR_T implies intptr_t is
available as well as uintptr_t. If that turns out not to be
true, things must get uglier (C99 wants both, so I think it's
an assumption we're *likely* to get away with).
thread_nt.h, PyThread_start_new_thread: MS _beginthread is documented
as returning unsigned long; no idea why uintptr_t was being used.
Others: Always use Py_[u]intptr_t, never [u]intptr_t directly.
Diffstat (limited to 'PC')
| -rwxr-xr-x | PC/msvcrtmodule.c | 2 | ||||
| -rw-r--r-- | PC/pyconfig.h | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/PC/msvcrtmodule.c b/PC/msvcrtmodule.c index 2714458..4584370 100755 --- a/PC/msvcrtmodule.c +++ b/PC/msvcrtmodule.c @@ -98,7 +98,7 @@ static PyObject * msvcrt_get_osfhandle(PyObject *self, PyObject *args) { int fd; - intptr_t handle; + Py_intptr_t handle; if (!PyArg_ParseTuple(args,"i:get_osfhandle", &fd)) return NULL; diff --git a/PC/pyconfig.h b/PC/pyconfig.h index 1e279ed..f287605 100644 --- a/PC/pyconfig.h +++ b/PC/pyconfig.h @@ -294,10 +294,6 @@ typedef int pid_t; #if _MSC_VER >= 1200 /* This file only exists in VC 6.0 or higher */ #include <basetsd.h> #endif -#if defined(MS_WINDOWS) && !defined(MS_WIN64) -typedef long intptr_t; -typedef unsigned long uintptr_t; -#endif #if defined(MS_WIN64) /* maintain "win32" sys.platform for backward compatibility of Python code, |