diff options
| author | Mark Dickinson <dickinsm@gmail.com> | 2009-05-05 17:54:36 (GMT) |
|---|---|---|
| committer | Mark Dickinson <dickinsm@gmail.com> | 2009-05-05 17:54:36 (GMT) |
| commit | 9cc2cf78ad9ae38fbe56e7e4c3a9d6f0a4a4104f (patch) | |
| tree | b6a87d250741ef9f2b44a6a19850c4224ab4b110 | |
| parent | 3bef15be2d997124efc8cafca0e17aaf07a386dc (diff) | |
| download | cpython-9cc2cf78ad9ae38fbe56e7e4c3a9d6f0a4a4104f.zip cpython-9cc2cf78ad9ae38fbe56e7e4c3a9d6f0a4a4104f.tar.gz cpython-9cc2cf78ad9ae38fbe56e7e4c3a9d6f0a4a4104f.tar.bz2 | |
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.
........
| -rw-r--r-- | Modules/_ctypes/cfield.c | 4 | ||||
| -rw-r--r-- | Modules/_randommodule.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Modules/_ctypes/cfield.c b/Modules/_ctypes/cfield.c index 3ad1c9e..ff24405 100644 --- a/Modules/_ctypes/cfield.c +++ b/Modules/_ctypes/cfield.c @@ -362,7 +362,7 @@ get_ulong(PyObject *v, unsigned long *p) 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 @@ get_ulonglong(PyObject *v, unsigned PY_LONG_LONG *p) 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; diff --git a/Modules/_randommodule.c b/Modules/_randommodule.c index 2718b69..05c09d8 100644 --- a/Modules/_randommodule.c +++ b/Modules/_randommodule.c @@ -355,7 +355,7 @@ random_setstate(RandomObject *self, PyObject *state) 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 */ } |