Kaydet (Commit) 7a822dab authored tarafından Tim Peters's avatar Tim Peters

Some Win64 pre-release in 2000 didn't support

QueryPerformanceCounter(), but we believe Win64 does
support it now.  So use in time.clock().

It would be peachy if someone with a Win64 box tried
this ;-)
üst 36850456
...@@ -64,6 +64,10 @@ Extension Modules ...@@ -64,6 +64,10 @@ Extension Modules
- Use Win32 API to implement os.{access,chdir,chmod,mkdir,remove,rename,rmdir,utime}. - 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. 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 - Calling Tk_Init twice is refused if the first call failed as that
may deadlock. may deadlock.
......
...@@ -63,11 +63,10 @@ static long main_thread; ...@@ -63,11 +63,10 @@ static long main_thread;
#endif /* MS_WINDOWS */ #endif /* MS_WINDOWS */
#endif /* !__WATCOMC__ || __QNX__ */ #endif /* !__WATCOMC__ || __QNX__ */
#if defined(MS_WINDOWS) && !defined(MS_WIN64) && !defined(__BORLANDC__) #if defined(MS_WINDOWS) && !defined(__BORLANDC__)
/* Win32 has better clock replacement /* 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 */ #undef HAVE_CLOCK /* We have our own version down below */
#endif /* MS_WINDOWS && !MS_WIN64 */ #endif /* MS_WINDOWS && !defined(__BORLANDC__) */
#if defined(PYOS_OS2) #if defined(PYOS_OS2)
#define INCL_DOS #define INCL_DOS
...@@ -821,7 +820,7 @@ inittime(void) ...@@ -821,7 +820,7 @@ inittime(void)
SetConsoleCtrlHandler( PyCtrlHandler, TRUE); SetConsoleCtrlHandler( PyCtrlHandler, TRUE);
#endif /* MS_WINDOWS */ #endif /* MS_WINDOWS */
if (!initialized) { if (!initialized) {
PyStructSequence_InitType(&StructTimeType, PyStructSequence_InitType(&StructTimeType,
&struct_time_type_desc); &struct_time_type_desc);
} }
Py_INCREF(&StructTimeType); Py_INCREF(&StructTimeType);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment