Index: Include/pythread.h
===================================================================
--- Include/pythread.h	(revision 83010)
+++ Include/pythread.h	(working copy)
@@ -39,9 +39,9 @@
 
 /* In the NT API, the timeout is a DWORD and is expressed in milliseconds */
 #if defined (NT_THREADS)
-#if (0xFFFFFFFFLL * 1000 < PY_TIMEOUT_MAX)
+#if (Py_LL(0xFFFFFFFF) * 1000 < PY_TIMEOUT_MAX)
 #undef PY_TIMEOUT_MAX
-#define PY_TIMEOUT_MAX (0xFFFFFFFFLL * 1000)
+#define PY_TIMEOUT_MAX (Py_LL(0xFFFFFFFF) * 1000)
 #endif
 #endif
 
Index: PC/pyconfig.h
===================================================================
--- PC/pyconfig.h	(revision 83010)
+++ PC/pyconfig.h	(working copy)
@@ -100,6 +100,17 @@
 #define environ (NULL)
 #endif
 
+/* Old Platform SDK may not have these macros */
+#ifndef IO_REPARSE_TAG_SYMLINK
+#define IO_REPARSE_TAG_SYMLINK 0xA000000C
+#endif
+#ifndef VOLUME_NAME_DOS
+#define VOLUME_NAME_DOS 0x0
+#endif
+#ifndef VOLUME_NAME_NT
+#define VOLUME_NAME_NT 0x2
+#endif
+
 /* Compiler specific defines */
 
 /* ------------------------------------------------------------------------*/
Index: Python/import.c
===================================================================
--- Python/import.c	(revision 83010)
+++ Python/import.c	(working copy)
@@ -27,7 +27,11 @@
 typedef unsigned short mode_t;
 #endif
 
+#ifndef HAVE_UNISTD_H
+extern int mkdir(const char *, mode_t);
+#endif
 
+
 /* Magic word to reject .pyc files generated by other Python versions.
    It should change for each incompatible change to the bytecode.