summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeal Norwitz <nnorwitz@gmail.com>2008-03-25 04:18:18 (GMT)
committerNeal Norwitz <nnorwitz@gmail.com>2008-03-25 04:18:18 (GMT)
commit4677fbf7de591d0cea0d1aeaa9639ee46faa48f5 (patch)
tree901a21ade405c98f331df5c2ef3ccf1266280f0b
parent40f5e4c5a20436e61e8cdcda9c5a3d0162f9435c (diff)
downloadcpython-4677fbf7de591d0cea0d1aeaa9639ee46faa48f5.zip
cpython-4677fbf7de591d0cea0d1aeaa9639ee46faa48f5.tar.gz
cpython-4677fbf7de591d0cea0d1aeaa9639ee46faa48f5.tar.bz2
Try to fix a bunch of compiler warnings on Win64.
-rw-r--r--Objects/unicodeobject.c2
-rw-r--r--PC/_winreg.c2
-rw-r--r--PC/w9xpopen.c2
-rw-r--r--Python/peephole.c4
4 files changed, 5 insertions, 5 deletions
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 68df57d..5dd89c4 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -7261,7 +7261,7 @@ unicode_repeat(PyUnicodeObject *str, Py_ssize_t len)
done = str->length;
}
while (done < nchars) {
- int n = (done <= nchars-done) ? done : nchars-done;
+ Py_ssize_t n = (done <= nchars-done) ? done : nchars-done;
Py_UNICODE_COPY(p+done, p, n);
done += n;
}
diff --git a/PC/_winreg.c b/PC/_winreg.c
index 19f928e..dfc4cf8 100644
--- a/PC/_winreg.c
+++ b/PC/_winreg.c
@@ -715,7 +715,7 @@ countStrings(char *data, int len)
static BOOL
Py2Reg(PyObject *value, DWORD typ, BYTE **retDataBuf, DWORD *retDataSize)
{
- int i,j;
+ Py_ssize_t i,j;
switch (typ) {
case REG_DWORD:
if (value != Py_None && !PyInt_Check(value))
diff --git a/PC/w9xpopen.c b/PC/w9xpopen.c
index f8439f2..b3978dd 100644
--- a/PC/w9xpopen.c
+++ b/PC/w9xpopen.c
@@ -30,7 +30,7 @@ int main(int argc, char *argv[])
STARTUPINFO si;
PROCESS_INFORMATION pi;
DWORD exit_code=0;
- int cmdlen = 0;
+ size_t cmdlen = 0;
int i;
char *cmdline, *cmdlinefill;
diff --git a/Python/peephole.c b/Python/peephole.c
index 430f939..e9da377 100644
--- a/Python/peephole.c
+++ b/Python/peephole.c
@@ -29,7 +29,7 @@
Also works for BUILD_LIST when followed by an "in" or "not in" test.
*/
static int
-tuple_of_constants(unsigned char *codestr, int n, PyObject *consts)
+tuple_of_constants(unsigned char *codestr, Py_ssize_t n, PyObject *consts)
{
PyObject *newconst, *constant;
Py_ssize_t i, arg, len_consts;
@@ -228,7 +228,7 @@ fold_unaryops_on_constants(unsigned char *codestr, PyObject *consts)
}
static unsigned int *
-markblocks(unsigned char *code, int len)
+markblocks(unsigned char *code, Py_ssize_t len)
{
unsigned int *blocks = (unsigned int *)PyMem_Malloc(len*sizeof(int));
int i,j, opcode, blockcnt = 0;