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.
........
This commit is contained in:
Antoine Pitrou 2011-01-19 15:26:37 +00:00
parent 566facd39b
commit 710e96651d
2 changed files with 5 additions and 0 deletions

View file

@ -37,6 +37,9 @@ Core and Builtins
Library 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 - 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 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. is made (IndexError is raised instead). Patch by Ross Lagerwall.

View file

@ -328,6 +328,8 @@ extern int lstat(const char *, struct stat *);
/* choose the appropriate stat and fstat functions and return structs */ /* choose the appropriate stat and fstat functions and return structs */
#undef STAT #undef STAT
#undef FSTAT
#undef STRUCT_STAT
#if defined(MS_WIN64) || defined(MS_WINDOWS) #if defined(MS_WIN64) || defined(MS_WINDOWS)
# define STAT win32_stat # define STAT win32_stat
# define FSTAT win32_fstat # define FSTAT win32_fstat