summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2011-01-19 15:26:37 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2011-01-19 15:26:37 (GMT)
commit710e96651d5fb2936a486a801801ddf24ab614d1 (patch)
treedced7f39448b8de3483ab4a891e627c11ce60456 /Modules
parent566facd39b90595b1b7ab61a26c77e426ac22c73 (diff)
downloadcpython-710e96651d5fb2936a486a801801ddf24ab614d1.zip
cpython-710e96651d5fb2936a486a801801ddf24ab614d1.tar.gz
cpython-710e96651d5fb2936a486a801801ddf24ab614d1.tar.bz2
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. ........
Diffstat (limited to 'Modules')
-rw-r--r--Modules/posixmodule.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index 870c0ea..a836af6 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