[Python-checkins] r84077 - in python/branches/release31-maint: Modules/binascii.c Modules/mmapmodule.c Modules/posixmodule.c

[antoine.pitrou]

Author: antoine.pitrou
Date: Sun Aug 15 20:32:16 2010
New Revision: 84077

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

........
  r84076 | antoine.pitrou | 2010-08-15 20:07:50 +0200 (dim., 15 août 2010) | 4 lines
  
  Fix other warnings under 64-bit Windows.
........


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Modules/binascii.c
   python/branches/release31-maint/Modules/mmapmodule.c
   python/branches/release31-maint/Modules/posixmodule.c

Modified: python/branches/release31-maint/Modules/binascii.c
==============================================================================
--- python/branches/release31-maint/Modules/binascii.c	(original)
+++ python/branches/release31-maint/Modules/binascii.c	Sun Aug 15 20:32:16 2010
@@ -653,7 +653,7 @@
                 /* More than 3 in a row. Output RLE. */
                 *out_data++ = ch;
                 *out_data++ = RUNCHAR;
-                *out_data++ = inend-in;
+                *out_data++ = (unsigned char) inend-in;
                 in = inend-1;
             } else {
                 /* Less than 3. Output the byte itself */

Modified: python/branches/release31-maint/Modules/mmapmodule.c
==============================================================================
--- python/branches/release31-maint/Modules/mmapmodule.c	(original)
+++ python/branches/release31-maint/Modules/mmapmodule.c	Sun Aug 15 20:32:16 2010
@@ -845,7 +845,7 @@
                             "in range(0, 256)");
             return -1;
         }
-        self->data[i] = v;
+        self->data[i] = (char) v;
         return 0;
     }
     else if (PySlice_Check(item)) {

Modified: python/branches/release31-maint/Modules/posixmodule.c
==============================================================================
--- python/branches/release31-maint/Modules/posixmodule.c	(original)
+++ python/branches/release31-maint/Modules/posixmodule.c	Sun Aug 15 20:32:16 2010
@@ -393,7 +393,7 @@
     const int i1 = fd >> IOINFO_L2E;
     const int i2 = fd & ((1 << IOINFO_L2E) - 1);
 
-    static int sizeof_ioinfo = 0;
+    static size_t sizeof_ioinfo = 0;
 
     /* Determine the actual size of the ioinfo structure,
      * as used by the CRT loaded in memory
@@ -3491,8 +3491,8 @@
     char **argvlist;
     char **envlist;
     PyObject *res = NULL;
-    int mode, envc;
-    Py_ssize_t argc, i;
+    int mode;
+    Py_ssize_t argc, i, envc;
     Py_intptr_t spawnval;
     PyObject *(*getitem)(PyObject *, Py_ssize_t);
     Py_ssize_t lastarg = 0;
@@ -3677,7 +3677,8 @@
     char **argvlist;
     char **envlist;
     PyObject *res=NULL;
-    int mode, i, argc, envc;
+    int mode;
+    Py_ssize_t argc, i, envc;
     Py_intptr_t spawnval;
     PyObject *(*getitem)(PyObject *, Py_ssize_t);
     int lastarg = 0;