From 710e96651d5fb2936a486a801801ddf24ab614d1 Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Wed, 19 Jan 2011 15:26:37 +0000 Subject: [PATCH] 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. ........ --- Misc/NEWS | 3 +++ Modules/posixmodule.c | 2 ++ 2 files changed, 5 insertions(+) diff --git a/Misc/NEWS b/Misc/NEWS index abc496bdb28..ba9a88dbc73 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -37,6 +37,9 @@ Core and Builtins 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. diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c index 870c0ea85ea..a836af6cd05 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -328,6 +328,8 @@ extern int lstat(const char *, struct stat *); /* 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