mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

merge 3.5 (#27656)

Browse source
This commit is contained in:
Benjamin Peterson 2016-07-30 23:22:24 -07:00
commit bf5868d2c5
2 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Misc/NEWS
View file

@ -41,6 +41,8 @@ Library
- Issue #7063: Remove dead code from the "array" module's slice handling. - Issue #7063: Remove dead code from the "array" module's slice handling.
Patch by Chuck. Patch by Chuck.
- Issue #27656: Do not assume sched.h defines any SCHED_* constants.
- Issue #27130: In the "zlib" module, fix handling of large buffers - Issue #27130: In the "zlib" module, fix handling of large buffers
(typically 4 GiB) when compressing and decompressing. Previously, inputs (typically 4 GiB) when compressing and decompressing. Previously, inputs
were limited to 4 GiB, and compression and decompression operations did not were limited to 4 GiB, and compression and decompression operations did not

6
Modules/posixmodule.c
View file

@ -12938,9 +12938,15 @@ all_ins(PyObject *m)
#endif #endif
#ifdef HAVE_SCHED_H #ifdef HAVE_SCHED_H
#ifdef SCHED_OTHER
if (PyModule_AddIntMacro(m, SCHED_OTHER)) return -1; if (PyModule_AddIntMacro(m, SCHED_OTHER)) return -1;
#endif
#ifdef SCHED_FIFO
if (PyModule_AddIntMacro(m, SCHED_FIFO)) return -1; if (PyModule_AddIntMacro(m, SCHED_FIFO)) return -1;
#endif
#ifdef SCHED_RR
if (PyModule_AddIntMacro(m, SCHED_RR)) return -1; if (PyModule_AddIntMacro(m, SCHED_RR)) return -1;
#endif
#ifdef SCHED_SPORADIC #ifdef SCHED_SPORADIC
if (PyModule_AddIntMacro(m, SCHED_SPORADIC) return -1; if (PyModule_AddIntMacro(m, SCHED_SPORADIC) return -1;
#endif #endif