From: Victor Stinner <victor.stinner@gmail.com>
Date: Fri, 13 Apr 2012 21:44:05 +0000 (+0200)
Subject: Fix clock_gettime/getres/settime: PyArg_ParseTuple() expects an int
X-Git-Tag: v3.3.0a3~237
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b8d016955a577eb54b6508f2f2c8d1247e03c8e4;p=python

Fix clock_gettime/getres/settime: PyArg_ParseTuple() expects an int

Only use a single #ifdef for the 3 functions.
---

diff --git a/Modules/timemodule.c b/Modules/timemodule.c
index 23f3ddd765..771db839b8 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},