diff --git a/Misc/NEWS b/Misc/NEWS index 6df7a6ac0ff..7ab2c77bd91 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -38,6 +38,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 473fefaa344..aa2d63ac4ac 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -12708,7 +12708,16 @@ os_truncate_impl(PyModuleDef *module, path_t *path, Py_off_t length) #endif /* HAVE_TRUNCATE */ -#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) /*[clinic input] os.posix_fallocate @@ -12771,10 +12780,10 @@ os_posix_fallocate_impl(PyModuleDef *module, int fd, Py_off_t offset, Py_off_t l } Py_RETURN_NONE; } -#endif /* HAVE_POSIX_FALLOCATE */ +#endif /* HAVE_POSIX_FALLOCATE) && !POSIX_FADVISE_AIX_BUG */ -#ifdef HAVE_POSIX_FADVISE +#if defined(HAVE_POSIX_FADVISE) && !defined(POSIX_FADVISE_AIX_BUG) /*[clinic input] os.posix_fadvise @@ -12849,7 +12858,7 @@ os_posix_fadvise_impl(PyModuleDef *module, int fd, Py_off_t offset, Py_off_t len } Py_RETURN_NONE; } -#endif /* HAVE_POSIX_FADVISE */ +#endif /* HAVE_POSIX_FADVISE && !POSIX_FADVISE_AIX_BUG */ #ifdef HAVE_PUTENV