From dfb4ebda24c1393888779357a4c9bd5bf7e4eaee Mon Sep 17 00:00:00 2001 From: Fred Drake Date: Thu, 29 Jun 2000 20:56:28 +0000 Subject: [PATCH] Trent Mick : Mark Hammond provided (a long time ago) a better Win32 specific time_clock implementation in timemodule.c. The library for this implementation does not exist on Win64 (yet, at least). This patch makes Win64 fall back on the system's clock() function for time_clock(). This closes SourceForge patch #100512. --- Modules/timemodule.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Modules/timemodule.c b/Modules/timemodule.c index 2644e72235e..fa7a6358fa5 100644 --- a/Modules/timemodule.c +++ b/Modules/timemodule.c @@ -89,11 +89,12 @@ extern int ftime(); #endif /* MS_WINDOWS */ #endif /* !__WATCOMC__ || __QNX__ */ -#ifdef MS_WIN32 -/* Win32 has better clock replacement */ +#if defined(MS_WIN32) && !defined(MS_WIN64) +/* Win32 has better clock replacement + XXX Win64 does not yet, but might when the platform matures. */ #include #undef HAVE_CLOCK /* We have our own version down below */ -#endif /* MS_WIN32 */ +#endif /* MS_WIN32 && !MS_WIN64 */ #if defined(PYCC_VACPP) #include @@ -190,7 +191,7 @@ time_clock(self, args) } #endif /* HAVE_CLOCK */ -#ifdef MS_WIN32 +#if defined(MS_WIN32) && !defined(MS_WIN64) /* Due to Mark Hammond */ static PyObject * time_clock(self, args) @@ -226,7 +227,7 @@ time_clock(self, args) } #define HAVE_CLOCK /* So it gets included in the methods */ -#endif /* MS_WIN32 */ +#endif /* MS_WIN32 && !MS_WIN64 */ #ifdef HAVE_CLOCK static char clock_doc[] =