diff options
| author | Fredrik Lundh <fredrik@pythonware.com> | 2000-08-07 20:16:28 (GMT) |
|---|---|---|
| committer | Fredrik Lundh <fredrik@pythonware.com> | 2000-08-07 20:16:28 (GMT) |
| commit | 6947d0b65eb21606de8e17b180bf116421d23116 (patch) | |
| tree | 00edf27eb1777cdbd947a333192db8344f36aa9d | |
| parent | 6c2f0c73a13e1d106042661ddf5c6ab1d56bdd01 (diff) | |
| download | cpython-6947d0b65eb21606de8e17b180bf116421d23116.zip cpython-6947d0b65eb21606de8e17b180bf116421d23116.tar.gz cpython-6947d0b65eb21606de8e17b180bf116421d23116.tar.bz2 | |
-- from Trent Mick: [Patch #101010] replace use of INT_PTR
with uintptr_t (fix MSVC 5.0 build)
| -rw-r--r-- | PC/config.h | 4 | ||||
| -rw-r--r-- | Python/thread_nt.h | 6 |
2 files changed, 3 insertions, 7 deletions
diff --git a/PC/config.h b/PC/config.h index 9b68373..f1b0de7 100644 --- a/PC/config.h +++ b/PC/config.h @@ -241,13 +241,13 @@ typedef int pid_t; /* End of compilers - finish up */ -/* define the ANSI intptr_t type for portable use of a pointer sized - integer */ +/* define some ANSI types that are not defined in earlier Win headers */ #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) diff --git a/Python/thread_nt.h b/Python/thread_nt.h index 9d41820..5e295cb 100644 --- a/Python/thread_nt.h +++ b/Python/thread_nt.h @@ -161,11 +161,7 @@ static void PyThread__init_thread(void) */ int PyThread_start_new_thread(void (*func)(void *), void *arg) { -#if _MSC_VER >= 1200 - INT_PTR rv; -#else - unsigned long rv; -#endif + uintptr_t rv; int success = 0; dprintf(("%ld: PyThread_start_new_thread called\n", PyThread_get_thread_ident())); |