diff options
author | Antoine Pitrou <solipsis@pitrou.net> | 2011-01-19 15:27:24 (GMT) |
---|---|---|
committer | Antoine Pitrou <solipsis@pitrou.net> | 2011-01-19 15:27:24 (GMT) |
commit | 63a3f151556e331a8b8608d2f8646b3ecc5d8b0a (patch) | |
tree | 96c266befadff6773ea48fb9936a9856d1d1baf1 | |
parent | 3013b16b62be7768700d685f6a68e606b5f20e5a (diff) | |
download | cpython-63a3f151556e331a8b8608d2f8646b3ecc5d8b0a.zip cpython-63a3f151556e331a8b8608d2f8646b3ecc5d8b0a.tar.gz cpython-63a3f151556e331a8b8608d2f8646b3ecc5d8b0a.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.
........
-rw-r--r-- | Misc/NEWS | 3 | ||||
-rw-r--r-- | Modules/posixmodule.c | 2 |
2 files changed, 5 insertions, 0 deletions
@@ -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 8066d45..48762c1 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 |