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.
........

diff --git a/Misc/NEWS b/Misc/NEWS
index 6948fc6fc262fb5c7d9d2eb4f6b29e0804deb3ff..4e49d8f74076d32167ca304681f1006253f08276 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -72,6 +72,9 @@ C-API
 Library
 -------
 
+- Issue #6236, #6348: Fix various failures in the I/O library under AIX
+  and other platforms, when using a non-gcc compiler. Patch by egreen.
+
 - Issue #4606: Passing 'None' if ctypes argtype is set to POINTER(...)
   does now always result in NULL.
 

diff --git a/Modules/_io/fileio.c b/Modules/_io/fileio.c
index 4e7c721addad9eea4da240c49645b76442caaffc..438848bc908ba866ed5579dd698cb97b4ba6db5d 100644 (file)
--- a/Modules/_io/fileio.c
+++ b/Modules/_io/fileio.c
@@ -45,10 +45,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 */
+       unsigned int closefd : 1;
        PyObject *weakreflist;
        PyObject *dict;
 } fileio;

diff --git a/Modules/_io/textio.c b/Modules/_io/textio.c
index b91852e3516439a4c12fb3e35c8206a563a4933d..333c93f92087a14fabb51e5f6113f483c6b2e6d4 100644 (file)
--- a/Modules/_io/textio.c
+++ b/Modules/_io/textio.c
@@ -190,9 +190,9 @@ typedef struct {
     PyObject_HEAD
     PyObject *decoder;
     PyObject *errors;
-    int pendingcr:1;
-    int translate:1;
-    unsigned int seennl:3;
+    signed int pendingcr: 1;
+    signed int translate: 1;
+    unsigned int seennl: 3;
 } nldecoder_object;
 
 static int