Repair idiot typo, and complete the job of trying to

use the Windows time.clock() implementation on Win64.

diff --git a/Modules/timemodule.c b/Modules/timemodule.c
index eb9f4d0c9c2727472468ec74a87dcae1c8560ca3..e03b7e13917ccfa787bfb1de8da83f0690bd90d6 100644 (file)
--- a/Modules/timemodule.c
+++ b/Modules/timemodule.c
@@ -64,8 +64,8 @@ static long main_thread;
 #endif /* !__WATCOMC__ || __QNX__ */
 
 #if defined(MS_WINDOWS) && !defined(__BORLANDC__)
-/* Win32 has better clock replacement
-#undef HAVE_CLOCK /* We have our own version down below */
+/* Win32 has better clock replacement; we have our own version below. */
+#undef HAVE_CLOCK
 #endif /* MS_WINDOWS && !defined(__BORLANDC__) */
 
 #if defined(PYOS_OS2)
@@ -161,7 +161,7 @@ time_clock(PyObject *self, PyObject *args)
 }
 #endif /* HAVE_CLOCK */
 
-#if defined(MS_WINDOWS) && !defined(MS_WIN64) && !defined(__BORLANDC__)
+#if defined(MS_WINDOWS) && !defined(__BORLANDC__)
 /* Due to Mark Hammond and Tim Peters */
 static PyObject *
 time_clock(PyObject *self, PyObject *args)
@@ -190,7 +190,7 @@ time_clock(PyObject *self, PyObject *args)
 }
 
 #define HAVE_CLOCK /* So it gets included in the methods */
-#endif /* MS_WINDOWS && !MS_WIN64 */
+#endif /* MS_WINDOWS && !defined(__BORLANDC__) */
 
 #ifdef HAVE_CLOCK
 PyDoc_STRVAR(clock_doc,