Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
81574b80
Commit
81574b80
authored
Oct 01, 2018
by
William Orr
Committed by
Benjamin Peterson
Oct 01, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
closes bpo-34862: Guard definition of convert_sched_param with POSIX_SPAWN_SETSCHEDULER. (GH-9658)
Fixes broken build on OpenBSD-current.
parent
be4e5b89
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
7 deletions
+9
-7
Modules/clinic/posixmodule.c.h
Modules/clinic/posixmodule.c.h
+3
-3
Modules/posixmodule.c
Modules/posixmodule.c
+6
-4
No files found.
Modules/clinic/posixmodule.c.h
View file @
81574b80
...
...
@@ -2064,7 +2064,7 @@ exit:
#endif
/* defined(HAVE_SCHED_H) && defined(HAVE_SCHED_SETSCHEDULER) */
#if defined(HAVE_SCHED_H) && (defined(HAVE_SCHED_SET
SCHEDULER) || defined(HAVE_SCHED_SET
PARAM))
#if defined(HAVE_SCHED_H) && (defined(HAVE_SCHED_SET
PARAM) || defined(HAVE_SCHED_SETSCHEDULER) || defined(POSIX_SPAWN_SETSCHEDULER) || defined(POSIX_SPAWN_SETSCHED
PARAM))
PyDoc_STRVAR
(
os_sched_param__doc__
,
"sched_param(sched_priority)
\n
"
...
...
@@ -2096,7 +2096,7 @@ exit:
return
return_value
;
}
#endif
/* defined(HAVE_SCHED_H) && (defined(HAVE_SCHED_SET
SCHEDULER) || defined(HAVE_SCHED_SET
PARAM)) */
#endif
/* defined(HAVE_SCHED_H) && (defined(HAVE_SCHED_SET
PARAM) || defined(HAVE_SCHED_SETSCHEDULER) || defined(POSIX_SPAWN_SETSCHEDULER) || defined(POSIX_SPAWN_SETSCHED
PARAM)) */
#if defined(HAVE_SCHED_H) && defined(HAVE_SCHED_SETSCHEDULER)
...
...
@@ -6757,4 +6757,4 @@ exit:
#ifndef OS_GETRANDOM_METHODDEF
#define OS_GETRANDOM_METHODDEF
#endif
/* !defined(OS_GETRANDOM_METHODDEF) */
/*[clinic end generated code: output=
40cac0135f846202
input=a9049054013a1b77]*/
/*[clinic end generated code: output=
1603fddefffa1fb9
input=a9049054013a1b77]*/
Modules/posixmodule.c
View file @
81574b80
...
...
@@ -1942,7 +1942,7 @@ static PyTypeObject WaitidResultType;
static
int
initialized
;
static
PyTypeObject
StatResultType
;
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
;
#endif
static
newfunc
structseq_new
;
...
...
@@ -5160,8 +5160,10 @@ enum posix_spawn_file_actions_identifier {
POSIX_SPAWN_DUP2
};
#if defined(HAVE_SCHED_SETPARAM) || defined(HAVE_SCHED_SETSCHEDULER) || defined(POSIX_SPAWN_SETSCHEDULER) || defined(POSIX_SPAWN_SETSCHEDPARAM)
static
int
convert_sched_param
(
PyObject
*
param
,
struct
sched_param
*
res
);
#endif
static
int
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 */
#if defined(HAVE_SCHED_SET
SCHEDULER) || defined(HAVE_SCHED_SET
PARAM)
#if defined(HAVE_SCHED_SET
PARAM) || defined(HAVE_SCHED_SETSCHEDULER) || defined(POSIX_SPAWN_SETSCHEDULER) || defined(POSIX_SPAWN_SETSCHED
PARAM)
/*[clinic input]
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
);
return
1
;
}
#endif
/* defined(HAVE_SCHED_SET
SCHEDULER) || defined(HAVE_SCHED_SET
PARAM) */
#endif
/* defined(HAVE_SCHED_SET
PARAM) || defined(HAVE_SCHED_SETSCHEDULER) || defined(POSIX_SPAWN_SETSCHEDULER) || defined(POSIX_SPAWN_SETSCHED
PARAM) */
#ifdef HAVE_SCHED_SETSCHEDULER
...
...
@@ -13925,7 +13927,7 @@ INITFUNC(void)
# 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"
;
if
(
PyStructSequence_InitType2
(
&
SchedParamType
,
&
sched_param_desc
)
<
0
)
return
NULL
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment