diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2014-09-30 10:20:05 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2014-09-30 10:20:05 (GMT) |
| commit | d6b176905d073ae6c109fa32bb16ec55a6e68c17 (patch) | |
| tree | 77ea72a6b01bceb9b64df8df9de6ca230a560e9f | |
| parent | 43030ee78041455566e7f78d6d5135eaa3455294 (diff) | |
| download | cpython-d6b176905d073ae6c109fa32bb16ec55a6e68c17.zip cpython-d6b176905d073ae6c109fa32bb16ec55a6e68c17.tar.gz cpython-d6b176905d073ae6c109fa32bb16ec55a6e68c17.tar.bz2 | |
Issue #22396: On 32-bit AIX platform, don't expose os.posix_fadvise() nor
os.posix_fallocate() because their prototypes in system headers are wrong.
| -rw-r--r-- | Misc/NEWS | 3 | ||||
| -rw-r--r-- | Modules/posixmodule.c | 16 |
2 files changed, 15 insertions, 4 deletions
@@ -19,6 +19,9 @@ Core and Builtins Library ------- +- Issue #22396: On 32-bit AIX platform, don't expose os.posix_fadvise() nor + os.posix_fallocate() because their prototypes in system headers are wrong. + - Issue #22517: When a io.BufferedRWPair object is deallocated, clear its weakrefs. diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c index 8cd5485..8bea76e 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -8786,7 +8786,15 @@ posix_truncate(PyObject *self, PyObject *args, PyObject *kwargs) } #endif -#ifdef HAVE_POSIX_FALLOCATE +/* Issue #22396: On 32-bit AIX platform, the prototypes of os.posix_fadvise() + and os.posix_fallocate() in system headers are wrong if _LARGE_FILES is + defined, which is the case in Python on AIX. AIX bug report: + http://www-01.ibm.com/support/docview.wss?uid=isg1IV56170 */ +#if defined(_AIX) && defined(_LARGE_FILES) && !defined(__64BIT__) +# define POSIX_FADVISE_AIX_BUG +#endif + +#if defined(HAVE_POSIX_FALLOCATE) && !defined(POSIX_FADVISE_AIX_BUG) PyDoc_STRVAR(posix_posix_fallocate__doc__, "posix_fallocate(fd, offset, len)\n\n\ Ensures that enough disk space is allocated for the file specified by fd\n\ @@ -8813,7 +8821,7 @@ posix_posix_fallocate(PyObject *self, PyObject *args) } #endif -#ifdef HAVE_POSIX_FADVISE +#if defined(HAVE_POSIX_FADVISE) && !defined(POSIX_FADVISE_AIX_BUG) PyDoc_STRVAR(posix_posix_fadvise__doc__, "posix_fadvise(fd, offset, len, advice)\n\n\ Announces an intention to access data in a specific pattern thus allowing\n\ @@ -11485,10 +11493,10 @@ static PyMethodDef posix_methods[] = { METH_VARARGS | METH_KEYWORDS, posix_truncate__doc__}, #endif -#ifdef HAVE_POSIX_FALLOCATE +#if defined(HAVE_POSIX_FALLOCATE) && !defined(POSIX_FADVISE_AIX_BUG) {"posix_fallocate", posix_posix_fallocate, METH_VARARGS, posix_posix_fallocate__doc__}, #endif -#ifdef HAVE_POSIX_FADVISE +#if defined(HAVE_POSIX_FADVISE) && !defined(POSIX_FADVISE_AIX_BUG) {"posix_fadvise", posix_posix_fadvise, METH_VARARGS, posix_posix_fadvise__doc__}, #endif #ifdef HAVE_PUTENV |