From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sun, 15 Aug 2010 18:32:16 +0000 (+0000)
Subject: Merged revisions 84076 via svnmerge from
X-Git-Tag: v3.1.3rc1~334
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=835b445a918a7e47849ab48522b11b404878b73d;p=python

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

diff --git a/Modules/binascii.c b/Modules/binascii.c
index e5418a40f4..648088bc02 100644
--- a/Modules/binascii.c
+++ b/Modules/binascii.c
@@ -653,7 +653,7 @@ binascii_rlecode_hqx(PyObject *self, PyObject *args)
                 /* 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 */
diff --git a/Modules/mmapmodule.c b/Modules/mmapmodule.c
index b170b3885e..c39715a364 100644
--- a/Modules/mmapmodule.c
+++ b/Modules/mmapmodule.c
@@ -845,7 +845,7 @@ mmap_ass_subscript(mmap_object *self, PyObject *item, PyObject *value)
                             "in range(0, 256)");
             return -1;
         }
-        self->data[i] = v;
+        self->data[i] = (char) v;
         return 0;
     }
     else if (PySlice_Check(item)) {
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index ef91dab010..5a5badd1c1 100644
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -393,7 +393,7 @@ _PyVerify_fd(int fd)
     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 @@ posix_spawnve(PyObject *self, PyObject *args)
     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 @@ posix_spawnvpe(PyObject *self, PyObject *args)
     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;