]> granicus.if.org Git - python/commitdiff
Merged revisions 72344 via svnmerge from
authorMark Dickinson <dickinsm@gmail.com>
Tue, 5 May 2009 17:42:59 +0000 (17:42 +0000)
committerMark Dickinson <dickinsm@gmail.com>
Tue, 5 May 2009 17:42:59 +0000 (17:42 +0000)
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.
........

Modules/_ctypes/cfield.c
Modules/_randommodule.c

index 96264e7e9a15e1dac43ca4d04350d939367b852b..4037e936eb87c7b8bfb323da28dc54aa6f60b353 100644 (file)
@@ -372,7 +372,7 @@ get_ulong(PyObject *v, unsigned long *p)
                return -1;
        }
        x = PyInt_AsUnsignedLongMask(v);
-       if (x == -1 && PyErr_Occurred())
+       if (x == (unsigned long)-1 && PyErr_Occurred())
                return -1;
        *p = x;
        return 0;
@@ -410,7 +410,7 @@ get_ulonglong(PyObject *v, unsigned PY_LONG_LONG *p)
                return -1;
        }
        x = PyInt_AsUnsignedLongLongMask(v);
-       if (x == -1 && PyErr_Occurred())
+       if (x == (unsigned PY_LONG_LONG)-1 && PyErr_Occurred())
                return -1;
        *p = x;
        return 0;
index ebad311af6db95b1791826fd68c61c5597b2909d..b45f24396bfa587afe48beff50d3a2707fd69e28 100644 (file)
@@ -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 */
        }