[Python-checkins] r75010 - in python/branches/release31-maint: Misc/NEWS Modules/_io/fileio.c Modules/_io/textio.c

[antoine.pitrou]

Author: antoine.pitrou
Date: Mon Sep 21 23:42:29 2009
New Revision: 75010

Log:
Merged revisions 75009 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r75009 | antoine.pitrou | 2009-09-21 23:37:02 +0200 (lun., 21 sept. 2009) | 13 lines
  
  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.
  ........
................


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Misc/NEWS
   python/branches/release31-maint/Modules/_io/fileio.c
   python/branches/release31-maint/Modules/_io/textio.c

Modified: python/branches/release31-maint/Misc/NEWS
==============================================================================
--- python/branches/release31-maint/Misc/NEWS	(original)
+++ python/branches/release31-maint/Misc/NEWS	Mon Sep 21 23:42:29 2009
@@ -21,6 +21,9 @@
 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 #6954: Fixed crash when using DISTUTILS_DEBUG flag in Distutils.
 
 - Issue #4606: Passing 'None' if ctypes argtype is set to POINTER(...)

Modified: python/branches/release31-maint/Modules/_io/fileio.c
==============================================================================
--- python/branches/release31-maint/Modules/_io/fileio.c	(original)
+++ python/branches/release31-maint/Modules/_io/fileio.c	Mon Sep 21 23:42:29 2009
@@ -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;

Modified: python/branches/release31-maint/Modules/_io/textio.c
==============================================================================
--- python/branches/release31-maint/Modules/_io/textio.c	(original)
+++ python/branches/release31-maint/Modules/_io/textio.c	Mon Sep 21 23:42:29 2009
@@ -190,9 +190,9 @@
     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