diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2012-04-13 21:44:05 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2012-04-13 21:44:05 (GMT) |
| commit | b8d016955a577eb54b6508f2f2c8d1247e03c8e4 (patch) | |
| tree | 25d44fc0858c7f7fa7eb560bffd4b038a4e02c9b /Modules | |
| parent | 0682a0c0a925c52bf4d8d3030681b82796bdc6e2 (diff) | |
| download | cpython-b8d016955a577eb54b6508f2f2c8d1247e03c8e4.zip cpython-b8d016955a577eb54b6508f2f2c8d1247e03c8e4.tar.gz cpython-b8d016955a577eb54b6508f2f2c8d1247e03c8e4.tar.bz2 | |
Fix clock_gettime/getres/settime: PyArg_ParseTuple() expects an int
Only use a single #ifdef for the 3 functions.
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/timemodule.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/Modules/timemodule.c b/Modules/timemodule.c index 23f3ddd..771db83 100644 --- a/Modules/timemodule.c +++ b/Modules/timemodule.c @@ -139,7 +139,7 @@ static PyObject * time_clock_gettime(PyObject *self, PyObject *args) { int ret; - clockid_t clk_id; + int clk_id; struct timespec tp; if (!PyArg_ParseTuple(args, "i:clock_gettime", &clk_id)) @@ -162,7 +162,7 @@ Return the time of the specified clock clk_id."); static PyObject * time_clock_settime(PyObject *self, PyObject *args) { - clockid_t clk_id; + int clk_id; PyObject *obj; struct timespec tp; int ret; @@ -185,14 +185,12 @@ PyDoc_STRVAR(clock_settime_doc, "clock_settime(clk_id, time)\n\ \n\ Set the time of the specified clock clk_id."); -#endif -#ifdef HAVE_CLOCK_GETRES static PyObject * time_clock_getres(PyObject *self, PyObject *args) { int ret; - clockid_t clk_id; + int clk_id; struct timespec tp; if (!PyArg_ParseTuple(args, "i:clock_getres", &clk_id)) @@ -211,7 +209,7 @@ PyDoc_STRVAR(clock_getres_doc, "clock_getres(clk_id) -> floating point number\n\ \n\ Return the resolution (precision) of the specified clock clk_id."); -#endif +#endif /* HAVE_CLOCK_GETTIME */ static PyObject * time_sleep(PyObject *self, PyObject *args) @@ -1009,11 +1007,7 @@ static PyMethodDef time_methods[] = { #endif #ifdef HAVE_CLOCK_GETTIME {"clock_gettime", time_clock_gettime, METH_VARARGS, clock_gettime_doc}, -#endif -#ifdef HAVE_CLOCK_GETTIME {"clock_settime", time_clock_settime, METH_VARARGS, clock_settime_doc}, -#endif -#ifdef HAVE_CLOCK_GETRES {"clock_getres", time_clock_getres, METH_VARARGS, clock_getres_doc}, #endif {"sleep", time_sleep, METH_VARARGS, sleep_doc}, |