Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

closes bpo-34862: Guard definition of convert_sched_param with POSIX_SPAWN_SETSCHEDULER. (GH-9658) 

Fixes broken build on OpenBSD-current.
This commit is contained in:
William Orr 2018-10-01 22:19:56 -07:00 committed by Benjamin Peterson
parent be4e5b8920
commit 81574b80e9
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Modules/clinic/posixmodule.c.h generated
View File

@ -2064,7 +2064,7 @@ exit:
#endif /* defined(HAVE_SCHED_H) && defined(HAVE_SCHED_SETSCHEDULER) */ #endif /* defined(HAVE_SCHED_H) && defined(HAVE_SCHED_SETSCHEDULER) */
#if defined(HAVE_SCHED_H) && (defined(HAVE_SCHED_SETSCHEDULER) || defined(HAVE_SCHED_SETPARAM)) #if defined(HAVE_SCHED_H) && (defined(HAVE_SCHED_SETPARAM) || defined(HAVE_SCHED_SETSCHEDULER) || defined(POSIX_SPAWN_SETSCHEDULER) || defined(POSIX_SPAWN_SETSCHEDPARAM))
PyDoc_STRVAR(os_sched_param__doc__, PyDoc_STRVAR(os_sched_param__doc__,
"sched_param(sched_priority)\n" "sched_param(sched_priority)\n"
@ -2096,7 +2096,7 @@ exit:
return return_value; return return_value;
} }
#endif /* defined(HAVE_SCHED_H) && (defined(HAVE_SCHED_SETSCHEDULER) || defined(HAVE_SCHED_SETPARAM)) */ #endif /* defined(HAVE_SCHED_H) && (defined(HAVE_SCHED_SETPARAM) || defined(HAVE_SCHED_SETSCHEDULER) || defined(POSIX_SPAWN_SETSCHEDULER) || defined(POSIX_SPAWN_SETSCHEDPARAM)) */
#if defined(HAVE_SCHED_H) && defined(HAVE_SCHED_SETSCHEDULER) #if defined(HAVE_SCHED_H) && defined(HAVE_SCHED_SETSCHEDULER)
@ -6757,4 +6757,4 @@ exit:
#ifndef OS_GETRANDOM_METHODDEF #ifndef OS_GETRANDOM_METHODDEF
#define OS_GETRANDOM_METHODDEF #define OS_GETRANDOM_METHODDEF
#endif /* !defined(OS_GETRANDOM_METHODDEF) */ #endif /* !defined(OS_GETRANDOM_METHODDEF) */
/*[clinic end generated code: output=40cac0135f846202 input=a9049054013a1b77]*/ /*[clinic end generated code: output=1603fddefffa1fb9 input=a9049054013a1b77]*/

10
Modules/posixmodule.c
View File

@ -1942,7 +1942,7 @@ static PyTypeObject WaitidResultType;
static int initialized; static int initialized;
static PyTypeObject StatResultType; static PyTypeObject StatResultType;
static PyTypeObject StatVFSResultType; static PyTypeObject StatVFSResultType;
#if defined(HAVE_SCHED_SETPARAM) || defined(HAVE_SCHED_SETSCHEDULER) #if defined(HAVE_SCHED_SETPARAM) || defined(HAVE_SCHED_SETSCHEDULER) || defined(POSIX_SPAWN_SETSCHEDULER) || defined(POSIX_SPAWN_SETSCHEDPARAM)
static PyTypeObject SchedParamType; static PyTypeObject SchedParamType;
#endif #endif
static newfunc structseq_new; static newfunc structseq_new;
@ -5160,8 +5160,10 @@ enum posix_spawn_file_actions_identifier {
POSIX_SPAWN_DUP2 POSIX_SPAWN_DUP2
}; };
#if defined(HAVE_SCHED_SETPARAM) || defined(HAVE_SCHED_SETSCHEDULER) || defined(POSIX_SPAWN_SETSCHEDULER) || defined(POSIX_SPAWN_SETSCHEDPARAM)
static int static int
convert_sched_param(PyObject *param, struct sched_param *res); convert_sched_param(PyObject *param, struct sched_param *res);
#endif
static int static int
parse_posix_spawn_flags(PyObject *setpgroup, int resetids, PyObject *setsigmask, parse_posix_spawn_flags(PyObject *setpgroup, int resetids, PyObject *setsigmask,
@ -5925,7 +5927,7 @@ os_sched_getscheduler_impl(PyObject *module, pid_t pid)
#endif /* HAVE_SCHED_SETSCHEDULER */ #endif /* HAVE_SCHED_SETSCHEDULER */
#if defined(HAVE_SCHED_SETSCHEDULER) || defined(HAVE_SCHED_SETPARAM) #if defined(HAVE_SCHED_SETPARAM) || defined(HAVE_SCHED_SETSCHEDULER) || defined(POSIX_SPAWN_SETSCHEDULER) || defined(POSIX_SPAWN_SETSCHEDPARAM)
/*[clinic input] /*[clinic input]
class os.sched_param "PyObject *" "&SchedParamType" class os.sched_param "PyObject *" "&SchedParamType"
@ -5986,7 +5988,7 @@ convert_sched_param(PyObject *param, struct sched_param *res)
res->sched_priority = Py_SAFE_DOWNCAST(priority, long, int); res->sched_priority = Py_SAFE_DOWNCAST(priority, long, int);
return 1; return 1;
} }
#endif /* defined(HAVE_SCHED_SETSCHEDULER) || defined(HAVE_SCHED_SETPARAM) */ #endif /* defined(HAVE_SCHED_SETPARAM) || defined(HAVE_SCHED_SETSCHEDULER) || defined(POSIX_SPAWN_SETSCHEDULER) || defined(POSIX_SPAWN_SETSCHEDPARAM) */
#ifdef HAVE_SCHED_SETSCHEDULER #ifdef HAVE_SCHED_SETSCHEDULER
@ -13925,7 +13927,7 @@ INITFUNC(void)
# endif # endif
#endif #endif
#if defined(HAVE_SCHED_SETPARAM) || defined(HAVE_SCHED_SETSCHEDULER) #if defined(HAVE_SCHED_SETPARAM) || defined(HAVE_SCHED_SETSCHEDULER) || defined(POSIX_SPAWN_SETSCHEDULER) || defined(POSIX_SPAWN_SETSCHEDPARAM)
sched_param_desc.name = MODNAME ".sched_param"; sched_param_desc.name = MODNAME ".sched_param";
if (PyStructSequence_InitType2(&SchedParamType, &sched_param_desc) < 0) if (PyStructSequence_InitType2(&SchedParamType, &sched_param_desc) < 0)
return NULL; return NULL;