[Python-checkins] r67589 - in python/branches/release30-maint: Objects/longobject.c

[mark.dickinson]

Author: mark.dickinson
Date: Fri Dec  5 18:25:42 2008
New Revision: 67589

Log:
Merged revisions 67588 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r67588 | mark.dickinson | 2008-12-05 17:14:29 +0000 (Fri, 05 Dec 2008) | 2 lines
  
  Issue 4497: silence compiler warnings on Windows.
........


Modified:
   python/branches/release30-maint/   (props changed)
   python/branches/release30-maint/Objects/longobject.c

Modified: python/branches/release30-maint/Objects/longobject.c
==============================================================================
--- python/branches/release30-maint/Objects/longobject.c	(original)
+++ python/branches/release30-maint/Objects/longobject.c	Fri Dec  5 18:25:42 2008
@@ -44,7 +44,7 @@
 }
 #define CHECK_SMALL_INT(ival) \
 	do if (-NSMALLNEGINTS <= ival && ival < NSMALLPOSINTS) { \
-		return get_small_int(ival); \
+		return get_small_int((int)ival); \
 	} while(0)
 
 static PyLongObject * 
@@ -198,7 +198,7 @@
 		v = _PyLong_New(1);
 		if (v) {
 			Py_SIZE(v) = sign;
-			v->ob_digit[0] = ival;
+			v->ob_digit[0] = (digit)ival;
 		}
 		return (PyObject*)v;
 	}
@@ -209,7 +209,7 @@
 		if (v) {
 			Py_SIZE(v) = 2*sign;
 			v->ob_digit[0] = (digit)ival & PyLong_MASK;
-			v->ob_digit[1] = ival >> PyLong_SHIFT;
+			v->ob_digit[1] = (digit)(ival >> PyLong_SHIFT);
 		}
 		return (PyObject*)v;
 	}
@@ -1103,7 +1103,7 @@
 	int ndigits = 0;
 
 	if (ival < PyLong_BASE)
-		return PyLong_FromLong(ival);
+		return PyLong_FromLong((long)ival);
 	/* Count the number of Python digits. */
 	t = (unsigned PY_LONG_LONG)ival;
 	while (t) {