summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2009-09-21 21:36:48 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2009-09-21 21:36:48 (GMT)
commit5cc3d037bb1069799afd4278ade14ba088678f21 (patch)
tree0434766c9f99d25d0966f1826c5c034d9cdf8007
parentedc625c316f0fd2cd576c17d64df3b6fc729b35b (diff)
downloadcpython-5cc3d037bb1069799afd4278ade14ba088678f21.zip
cpython-5cc3d037bb1069799afd4278ade14ba088678f21.tar.gz
cpython-5cc3d037bb1069799afd4278ade14ba088678f21.tar.bz2
Merged revisions 75007 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r75007 | antoine.pitrou | 2009-09-21 23:17:48 +0200 (lun., 21 sept. 2009) | 7 lines Issue #6236, #6348: Fix various failures in the io module under AIX and other platforms, when using a non-gcc compiler. Patch by egreen. In addition, I made explicit the signedness of all bitfields in the IO library. ........
-rw-r--r--Misc/NEWS3
-rw-r--r--Modules/_fileio.c8
2 files changed, 7 insertions, 4 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 900acc8..b4b9851 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -82,6 +82,9 @@ Core and Builtins
Library
-------
+- Issue #6236, #6348: Fix various failures in the `io` module under AIX
+ and other platforms, when using a non-gcc compiler. Patch by egreen.
+
- Issue #6851: Fix urllib.urlopen crash on secondairy threads on OSX 10.6
- Issue #6947: Fix distutils test on windows. Patch by Hirokazu Yamamoto.
diff --git a/Modules/_fileio.c b/Modules/_fileio.c
index fbe4189..5a3613b 100644
--- a/Modules/_fileio.c
+++ b/Modules/_fileio.c
@@ -30,10 +30,10 @@
typedef struct {
PyObject_HEAD
int fd;
- unsigned readable : 1;
- unsigned writable : 1;
- int seekable : 2; /* -1 means unknown */
- int closefd : 1;
+ unsigned int readable : 1;
+ unsigned int writable : 1;
+ signed int seekable : 2; /* -1 means unknown */
+ signed int closefd : 1;
PyObject *weakreflist;
} PyFileIOObject;