summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2010-08-15 18:32:16 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2010-08-15 18:32:16 (GMT)
commit835b445a918a7e47849ab48522b11b404878b73d (patch)
tree864ca87addb620c3c1c3ee01b4c4e597e700ae7b
parentbc760d9f4572c1f2356f7444d8cd3aa01f7fad38 (diff)
downloadcpython-835b445a918a7e47849ab48522b11b404878b73d.zip
cpython-835b445a918a7e47849ab48522b11b404878b73d.tar.gz
cpython-835b445a918a7e47849ab48522b11b404878b73d.tar.bz2
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. ........
-rw-r--r--Modules/binascii.c2
-rw-r--r--Modules/mmapmodule.c2
-rw-r--r--Modules/posixmodule.c9
3 files changed, 7 insertions, 6 deletions
diff --git a/Modules/binascii.c b/Modules/binascii.c
index e5418a4..648088b 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 b170b38..c39715a 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 ef91dab..5a5badd 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;