Skip to content

C
cpython
Kaydet (Commit) c285e62d authored tarafından Tim Peters's avatar Tim Peters
Dosyalara gözat
Seçenekler

Repair idiot typo, and complete the job of trying to 

use the Windows time.clock() implementation on Win64.
üst 4c803f1c
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
Modules/timemodule.c
Dosyayı görüntüle @ c285e62d
...@@ -64,8 +64,8 @@ static long main_thread; ...@@ -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) ...@@ -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) ...@@ -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,
......
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