@@ -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)
 
@@ -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()));