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 dcfaece24cf9ab94223168b70775cad03c716011..9c30d03e8772bf99e9687afdcbb35e70867d8533 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -35,6 +35,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #10898: Allow compiling the posix module when the C library defines
+  a symbol named FSTAT.
+
 - Issue #6075: IDLE on Mac OS X now works with both Carbon AquaTk and
   Cocoa AquaTk.
 

diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index 8066d457d115fd4d960e406153865d9cf61d2ff1..48762c1c07a9442aa7f2637bdbb8f96b78f06108 100644 (file)
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -340,6 +340,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