summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSenthil Kumaran <senthil@uthcode.com>2011-08-02 23:44:46 (GMT)
committerSenthil Kumaran <senthil@uthcode.com>2011-08-02 23:44:46 (GMT)
commitbbb8dec69edf0d7b11f68df32bbb3b442560dbe2 (patch)
tree4d2b30e1f816e820a80e712b42e1ddf8f6c7d211
parent90ceb4772b1c2d25d0745865ee0f63c71e02db2d (diff)
parentbad9c2f13ae2d1b7af3d64506b2ab1ad7850d20a (diff)
downloadcpython-bbb8dec69edf0d7b11f68df32bbb3b442560dbe2.zip
cpython-bbb8dec69edf0d7b11f68df32bbb3b442560dbe2.tar.gz
cpython-bbb8dec69edf0d7b11f68df32bbb3b442560dbe2.tar.bz2
merge heads.
-rw-r--r--Modules/posixmodule.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index 918ffb6..f4461c0 100644
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -1609,7 +1609,9 @@ static PyTypeObject WaitidResultType;
static int initialized;
static PyTypeObject StatResultType;
static PyTypeObject StatVFSResultType;
+#if defined(HAVE_SCHED_SETPARAM) || defined(HAVE_SCHED_SETSCHEDULER)
static PyTypeObject SchedParamType;
+#endif
static newfunc structseq_new;
static PyObject *
@@ -10965,8 +10967,11 @@ INITFUNC(void)
Py_INCREF((PyObject*) &StatVFSResultType);
PyModule_AddObject(m, "statvfs_result",
(PyObject*) &StatVFSResultType);
+
+#if defined(HAVE_SCHED_SETPARAM) || defined(HAVE_SCHED_SETSCHEDULER)
Py_INCREF(&SchedParamType);
PyModule_AddObject(m, "sched_param", (PyObject *)&SchedParamType);
+#endif
initialized = 1;
#ifdef __APPLE__