diff options
| -rw-r--r-- | Misc/NEWS | 4 | ||||
| -rw-r--r-- | Modules/timemodule.c | 7 |
2 files changed, 7 insertions, 4 deletions
@@ -64,6 +64,10 @@ Extension Modules - Use Win32 API to implement os.{access,chdir,chmod,mkdir,remove,rename,rmdir,utime}. As a result, these functions now raise WindowsError instead of OSError. +- ``time.clock()`` on Win64 should use the high-performance Windows + ``QueryPerformanceCounter()`` now (as was already the case on 32-bit + Windows platforms). + - Calling Tk_Init twice is refused if the first call failed as that may deadlock. diff --git a/Modules/timemodule.c b/Modules/timemodule.c index 742d6bf..eb9f4d0 100644 --- a/Modules/timemodule.c +++ b/Modules/timemodule.c @@ -63,11 +63,10 @@ static long main_thread; #endif /* MS_WINDOWS */ #endif /* !__WATCOMC__ || __QNX__ */ -#if defined(MS_WINDOWS) && !defined(MS_WIN64) && !defined(__BORLANDC__) +#if defined(MS_WINDOWS) && !defined(__BORLANDC__) /* Win32 has better clock replacement - XXX Win64 does not yet, but might when the platform matures. */ #undef HAVE_CLOCK /* We have our own version down below */ -#endif /* MS_WINDOWS && !MS_WIN64 */ +#endif /* MS_WINDOWS && !defined(__BORLANDC__) */ #if defined(PYOS_OS2) #define INCL_DOS @@ -821,7 +820,7 @@ inittime(void) SetConsoleCtrlHandler( PyCtrlHandler, TRUE); #endif /* MS_WINDOWS */ if (!initialized) { - PyStructSequence_InitType(&StructTimeType, + PyStructSequence_InitType(&StructTimeType, &struct_time_type_desc); } Py_INCREF(&StructTimeType); |