mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-14 18:59:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Merged revisions 84076 via svnmerge from

Browse source 
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.
........
This commit is contained in:
Antoine Pitrou 2010-08-15 18:32:16 +00:00
parent bc760d9f45
commit 835b445a91
3 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Modules/binascii.c
View file

@ -653,7 +653,7 @@ binascii_rlecode_hqx(PyObject *self, PyObject *args)
/* More than 3 in a row. Output RLE. */ /* More than 3 in a row. Output RLE. */
*out_data++ = ch; *out_data++ = ch;
*out_data++ = RUNCHAR; *out_data++ = RUNCHAR;
*out_data++ = inend-in; *out_data++ = (unsigned char) inend-in;
in = inend-1; in = inend-1;
} else { } else {
/* Less than 3. Output the byte itself */ /* Less than 3. Output the byte itself */

2
Modules/mmapmodule.c
View file

@ -845,7 +845,7 @@ mmap_ass_subscript(mmap_object *self, PyObject *item, PyObject *value)
"in range(0, 256)"); "in range(0, 256)");
return -1; return -1;
} }
self->data[i] = v; self->data[i] = (char) v;
return 0; return 0;
} }
else if (PySlice_Check(item)) { else if (PySlice_Check(item)) {

9
Modules/posixmodule.c
View file

@ -393,7 +393,7 @@ _PyVerify_fd(int fd)
const int i1 = fd >> IOINFO_L2E; const int i1 = fd >> IOINFO_L2E;
const int i2 = fd & ((1 << IOINFO_L2E) - 1); 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, /* Determine the actual size of the ioinfo structure,
* as used by the CRT loaded in memory * as used by the CRT loaded in memory
@ -3491,8 +3491,8 @@ posix_spawnve(PyObject *self, PyObject *args)
char **argvlist; char **argvlist;
char **envlist; char **envlist;
PyObject *res = NULL; PyObject *res = NULL;
int mode, envc; int mode;
Py_ssize_t argc, i; Py_ssize_t argc, i, envc;
Py_intptr_t spawnval; Py_intptr_t spawnval;
PyObject *(*getitem)(PyObject *, Py_ssize_t); PyObject *(*getitem)(PyObject *, Py_ssize_t);
Py_ssize_t lastarg = 0; Py_ssize_t lastarg = 0;
@ -3677,7 +3677,8 @@ posix_spawnvpe(PyObject *self, PyObject *args)
char **argvlist; char **argvlist;
char **envlist; char **envlist;
PyObject *res=NULL; PyObject *res=NULL;
int mode, i, argc, envc; int mode;
Py_ssize_t argc, i, envc;
Py_intptr_t spawnval; Py_intptr_t spawnval;
PyObject *(*getitem)(PyObject *, Py_ssize_t); PyObject *(*getitem)(PyObject *, Py_ssize_t);
int lastarg = 0; int lastarg = 0;