[Python-checkins] cpython (merge default -> default): merge heads.

[senthil.kumaran]

http://hg.python.org/cpython/rev/42f791043f08
changeset:   71717:42f791043f08
parent:      71715:a5b3d5051fc7
parent:      71713:c39804f08e90
user:        Senthil Kumaran <senthil at uthcode.com>
date:        Wed Aug 03 07:44:46 2011 +0800
summary:
  merge heads.

files:
  Modules/posixmodule.c |  5 +++++
  1 files changed, 5 insertions(+), 0 deletions(-)


diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -1609,7 +1609,9 @@
 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 @@
     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__

-- 
Repository URL: http://hg.python.org/cpython