Merged revisions 72479 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r72479 | mark.dickinson | 2009-05-08 21:58:08 +0100 (Fri, 08 May 2009) | 3 lines

  Issue #5933: Fix gcc -Wextra compiler warnings (and remove some
  trailing whitespace).
........

Modules/resource.c

@@ -159,20 +159,20 @@ resource_setrlimit(PyObject *self, PyObject *args)
 
 #if !defined(HAVE_LARGEFILE_SUPPORT)
 	rl.rlim_cur = PyLong_AsLong(curobj);
-	if (rl.rlim_cur == -1 && PyErr_Occurred())
+	if (rl.rlim_cur == (rlim_t)-1 && PyErr_Occurred())
 	    return NULL;
 	rl.rlim_max = PyLong_AsLong(maxobj);
-	if (rl.rlim_max == -1 && PyErr_Occurred())
+	if (rl.rlim_max == (rlim_t)-1 && PyErr_Occurred())
 	    return NULL;
 #else
 	/* The limits are probably bigger than a long */
 	rl.rlim_cur = PyLong_Check(curobj) ?
 		PyLong_AsLongLong(curobj) : PyLong_AsLong(curobj);
-	if (rl.rlim_cur == -1 && PyErr_Occurred())
+	if (rl.rlim_cur == (rlim_t)-1 && PyErr_Occurred())
 	    return NULL;
 	rl.rlim_max = PyLong_Check(maxobj) ?
 		PyLong_AsLongLong(maxobj) : PyLong_AsLong(maxobj);
-	if (rl.rlim_max == -1 && PyErr_Occurred())
+	if (rl.rlim_max == (rlim_t)-1 && PyErr_Occurred())
 	    return NULL;
 #endif