Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Repair idiot typo, and complete the job of trying to 

use the Windows time.clock() implementation on Win64.
This commit is contained in:
Tim Peters 2006-05-25 22:25:25 +00:00
parent 4c803f1c81
commit c285e62d76
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Modules/timemodule.c
View File

@ -64,8 +64,8 @@ static long main_thread;
#endif /* !__WATCOMC__ || __QNX__ */ #endif /* !__WATCOMC__ || __QNX__ */
#if defined(MS_WINDOWS) && !defined(__BORLANDC__) #if defined(MS_WINDOWS) && !defined(__BORLANDC__)
/* Win32 has better clock replacement /* Win32 has better clock replacement; we have our own version below. */
#undef HAVE_CLOCK /* We have our own version down below */ #undef HAVE_CLOCK
#endif /* MS_WINDOWS && !defined(__BORLANDC__) */ #endif /* MS_WINDOWS && !defined(__BORLANDC__) */
#if defined(PYOS_OS2) #if defined(PYOS_OS2)
@ -161,7 +161,7 @@ time_clock(PyObject *self, PyObject *args)
} }
#endif /* HAVE_CLOCK */ #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 */ /* Due to Mark Hammond and Tim Peters */
static PyObject * static PyObject *
time_clock(PyObject *self, PyObject *args) 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 */ #define HAVE_CLOCK /* So it gets included in the methods */
#endif /* MS_WINDOWS && !MS_WIN64 */ #endif /* MS_WINDOWS && !defined(__BORLANDC__) */
#ifdef HAVE_CLOCK #ifdef HAVE_CLOCK
PyDoc_STRVAR(clock_doc, PyDoc_STRVAR(clock_doc,