[Python-checkins] r72347 - in python/branches/release30-maint: Modules/_ctypes/cfield.c Modules/_randommodule.c
mark.dickinson
python-checkins at python.org
Tue May 5 19:55:59 CEST 2009
Author: mark.dickinson
Date: Tue May 5 19:55:58 2009
New Revision: 72347
Log:
Merged revisions 72346 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
r72346 | mark.dickinson | 2009-05-05 18:54:36 +0100 (Tue, 05 May 2009) | 10 lines
Merged revisions 72344 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r72344 | mark.dickinson | 2009-05-05 18:41:47 +0100 (Tue, 05 May 2009) | 3 lines
Issue #5933: Fix some gcc -Wextra warnings. Thanks Victor Stinner for
the patch.
........
................
Modified:
python/branches/release30-maint/ (props changed)
python/branches/release30-maint/Modules/_ctypes/cfield.c
python/branches/release30-maint/Modules/_randommodule.c
Modified: python/branches/release30-maint/Modules/_ctypes/cfield.c
==============================================================================
--- python/branches/release30-maint/Modules/_ctypes/cfield.c (original)
+++ python/branches/release30-maint/Modules/_ctypes/cfield.c Tue May 5 19:55:58 2009
@@ -362,7 +362,7 @@
return -1;
}
x = PyLong_AsUnsignedLongMask(v);
- if (x == -1 && PyErr_Occurred())
+ if (x == (unsigned long)-1 && PyErr_Occurred())
return -1;
*p = x;
return 0;
@@ -400,7 +400,7 @@
return -1;
}
x = PyLong_AsUnsignedLongLongMask(v);
- if (x == -1 && PyErr_Occurred())
+ if (x == (unsigned PY_LONG_LONG)-1 && PyErr_Occurred())
return -1;
*p = x;
return 0;
Modified: python/branches/release30-maint/Modules/_randommodule.c
==============================================================================
--- python/branches/release30-maint/Modules/_randommodule.c (original)
+++ python/branches/release30-maint/Modules/_randommodule.c Tue May 5 19:55:58 2009
@@ -355,7 +355,7 @@
for (i=0; i<N ; i++) {
element = PyLong_AsUnsignedLong(PyTuple_GET_ITEM(state, i));
- if (element == -1 && PyErr_Occurred())
+ if (element == (unsigned long)-1 && PyErr_Occurred())
return NULL;
self->state[i] = element & 0xffffffffUL; /* Make sure we get sane state */
}
More information about the Python-checkins
mailing list