From 62e97f023bf0c02f5f3c1a1552e8136c0b5c4cff Mon Sep 17 00:00:00 2001 From: Tim Peters Date: Tue, 28 Mar 2006 21:44:32 +0000 Subject: In format strings slinging Py_ssize_t, unconditionally interpolate PY_FORMAT_SIZE_T instead of #if'ing on MS_WIN64. --- Python/pythonrun.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'Python/pythonrun.c') diff --git a/Python/pythonrun.c b/Python/pythonrun.c index cd22942c6d9..4c8c5176e52 100644 --- a/Python/pythonrun.c +++ b/Python/pythonrun.c @@ -30,14 +30,11 @@ #endif #ifndef Py_REF_DEBUG -# define PRINT_TOTAL_REFS() +#define PRINT_TOTAL_REFS() #else /* Py_REF_DEBUG */ -# if defined(MS_WIN64) -# define PRINT_TOTAL_REFS() fprintf(stderr, "[%Id refs]\n", _Py_RefTotal); -# else /* ! MS_WIN64 */ -# define PRINT_TOTAL_REFS() fprintf(stderr, "[%ld refs]\n", \ - Py_SAFE_DOWNCAST(_Py_RefTotal, Py_ssize_t, long)); -# endif /* MS_WIN64 */ +#define PRINT_TOTAL_REFS() fprintf(stderr, \ + "[%" PY_FORMAT_SIZE_T "d refs]\n", \ + _Py_RefTotal) #endif extern char *Py_GetPath(void); @@ -393,7 +390,7 @@ Py_Finalize(void) dump_counts(); #endif - PRINT_TOTAL_REFS() + PRINT_TOTAL_REFS(); #ifdef Py_TRACE_REFS /* Display all objects still alive -- this can invoke arbitrary @@ -683,7 +680,7 @@ PyRun_InteractiveLoopFlags(FILE *fp, const char *filename, PyCompilerFlags *flag } for (;;) { ret = PyRun_InteractiveOneFlags(fp, filename, flags); - PRINT_TOTAL_REFS() + PRINT_TOTAL_REFS(); if (ret == E_EOF) return 0; /* -- cgit v1.2.3