[Python-checkins] r72344 - in python/trunk/Modules: _ctypes/cfield.c _randommodule.c

[mark.dickinson]

Author: mark.dickinson
Date: Tue May  5 19:41:47 2009
New Revision: 72344

Log:
Issue #5933: Fix some gcc -Wextra warnings.  Thanks Victor Stinner for
the patch.


Modified:
   python/trunk/Modules/_ctypes/cfield.c
   python/trunk/Modules/_randommodule.c

Modified: python/trunk/Modules/_ctypes/cfield.c
==============================================================================
--- python/trunk/Modules/_ctypes/cfield.c	(original)
+++ python/trunk/Modules/_ctypes/cfield.c	Tue May  5 19:41:47 2009
@@ -372,7 +372,7 @@
 		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 @@
  		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;

Modified: python/trunk/Modules/_randommodule.c
==============================================================================
--- python/trunk/Modules/_randommodule.c	(original)
+++ python/trunk/Modules/_randommodule.c	Tue May  5 19:41:47 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 */
 	}