[Python-checkins] r42877 - python/trunk/Modules/gcmodule.c

[neal.norwitz]

Author: neal.norwitz
Date: Tue Mar  7 00:31:56 2006
New Revision: 42877

Modified:
   python/trunk/Modules/gcmodule.c
Log:
Fix warnings on x86 (32-bit) and support Win64.

Modified: python/trunk/Modules/gcmodule.c
==============================================================================
--- python/trunk/Modules/gcmodule.c	(original)
+++ python/trunk/Modules/gcmodule.c	Tue Mar  7 00:31:56 2006
@@ -742,7 +742,13 @@
 				  generation);
 		PySys_WriteStderr("gc: objects in each generation:");
 		for (i = 0; i < NUM_GENERATIONS; i++) {
-			PySys_WriteStderr(" %ld", gc_list_size(GEN_HEAD(i)));
+#ifdef MS_WIN64
+			PySys_WriteStderr(" %Id", gc_list_size(GEN_HEAD(i)));
+#else
+			PySys_WriteStderr(" %ld",
+				Py_SAFE_DOWNCAST(gc_list_size(GEN_HEAD(i)),
+						 Py_ssize_t, long));
+#endif
 		}
 		PySys_WriteStderr("\n");
 	}
@@ -835,9 +841,16 @@
 			PySys_WriteStderr("gc: done.\n");
 		}
 		else {
+#ifdef MS_WIN64
 			PySys_WriteStderr(
-			    "gc: done, %ld unreachable, %ld uncollectable.\n",
+			    "gc: done, %Id unreachable, %Id uncollectable.\n",
 			    n+m, n);
+#else
+			PySys_WriteStderr(
+			    "gc: done, %ld unreachable, %ld uncollectable.\n",
+			    Py_SAFE_DOWNCAST(n+m, Py_ssize_t, long),
+			    Py_SAFE_DOWNCAST(n, Py_ssize_t, long));
+#endif
 		}
 	}