Mercurial > cpython-lru_cache-weakref
changeset 67689:07e1eb244df8 3.1
Merged revisions 88111 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r88111 | antoine.pitrou | 2011-01-19 16:21:35 +0100 (mer., 19 janv. 2011) | 4 lines
Issue #10898: Allow compiling the posix module when the C library defines
a symbol named FSTAT.
........
| author | Antoine Pitrou <solipsis@pitrou.net> |
|---|---|
| date | Wed, 19 Jan 2011 15:26:37 +0000 |
| parents | 2fde5abfb5f1 |
| children | f36538ba90a8 |
| files | Misc/NEWS Modules/posixmodule.c |
| diffstat | 2 files changed, 5 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/Misc/NEWS Tue Jan 18 19:06:09 2011 +0000 +++ b/Misc/NEWS Wed Jan 19 15:26:37 2011 +0000 @@ -37,6 +37,9 @@ Library ------- +- Issue #10898: Allow compiling the posix module when the C library defines + a symbol named FSTAT. + - Issue #10916: mmap should not segfault when a file is mapped using 0 as length and a non-zero offset, and an attempt to read past the end of file is made (IndexError is raised instead). Patch by Ross Lagerwall.
--- a/Modules/posixmodule.c Tue Jan 18 19:06:09 2011 +0000 +++ b/Modules/posixmodule.c Wed Jan 19 15:26:37 2011 +0000 @@ -328,6 +328,8 @@ /* choose the appropriate stat and fstat functions and return structs */ #undef STAT +#undef FSTAT +#undef STRUCT_STAT #if defined(MS_WIN64) || defined(MS_WINDOWS) # define STAT win32_stat # define FSTAT win32_fstat