Merged revisions 72344 via svnmerge from

mdickinson · mdickinson · commit 9cc2cf78ad9a · 2009-05-05T17:54:36.000Z
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. ........
diff --git 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
@@ -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 */
 	}

Original file line number	Diff line number	Diff line change
`@@ -355,7 +355,7 @@ random_setstate(RandomObject self, PyObject state)`
`355`	`355`
`356`	`356`	`for (i=0; i<N ; i++) {`
`357`	`357`	`element = PyLong_AsUnsignedLong(PyTuple_GET_ITEM(state, i));`
`358`		`- if (element == -1 && PyErr_Occurred())`
	`358`	`+ if (element == (unsigned long)-1 && PyErr_Occurred())`
`359`	`359`	`return NULL;`
`360`	`360`	`self->state[i] = element & 0xffffffffUL; /* Make sure we get sane state */`
`361`	`361`	`}`