From: Antoine Pitrou <solipsis@pitrou.net>
Date: Wed, 19 Jan 2011 15:27:24 +0000 (+0000)
Subject: Merged revisions 88111 via svnmerge from
X-Git-Tag: v2.7.2rc1~355
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=63a3f151556e331a8b8608d2f8646b3ecc5d8b0a;p=python

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 dcfaece24c..9c30d03e87 100644
--- 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 8066d457d1..48762c1c07 100644
--- 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