mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-02 08:02:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

(Merge 3.4) Issue #22396: On 32-bit AIX platform, don't expose

Browse source 
os.posix_fadvise() nor os.posix_fallocate() because their prototypes in system
headers are wrong.
This commit is contained in:
Victor Stinner 2014-09-30 12:35:58 +02:00
commit ec39e26881
2 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Misc/NEWS
View file

@ -38,6 +38,9 @@ Core and Builtins
Library 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 - Issue #22517: When a io.BufferedRWPair object is deallocated, clear its
weakrefs. weakrefs.

17
Modules/posixmodule.c
View file

@ -12708,7 +12708,16 @@ os_truncate_impl(PyModuleDef *module, path_t *path, Py_off_t length)
#endif /* HAVE_TRUNCATE */ #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] /*[clinic input]
os.posix_fallocate 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; 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] /*[clinic input]
os.posix_fadvise 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; Py_RETURN_NONE;
} }
#endif /* HAVE_POSIX_FADVISE */ #endif /* HAVE_POSIX_FADVISE && !POSIX_FADVISE_AIX_BUG */
#ifdef HAVE_PUTENV #ifdef HAVE_PUTENV