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.
........

diff --git a/Misc/NEWS b/Misc/NEWS
index abc496bdb284c8c47def3453fd4406f532a2fdee..ba9a88dbc73680e04a13ec34ea55269c9b5c6dc0 100644 (file)
--- 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 870c0ea85eaa8f7887c5a8eaaf86422bc5f9c1a3..a836af6cd05d272f2125a220c1edd0d44978bac2 100644 (file)
--- 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