From b2e1bf7e7d617bb9437c750d4ad4e392e331adbb Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Fri, 20 Feb 2004 15:16:31 +0000 Subject: [PATCH] No longer support Z as a flag to print size_t, it isn't used by libcurl and I doubt anyone else uses it. Better preprocessor magic for the O flag (for curl_off_t printing) to prevent compiler warnings. --- lib/mprintf.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/lib/mprintf.c b/lib/mprintf.c index 42199cb8f..60fe81fe8 100644 --- a/lib/mprintf.c +++ b/lib/mprintf.c @@ -374,19 +374,20 @@ static int dprintf_Pass1(char *format, va_stack_t *vto, char **endpos, va_list a case 'q': flags |= FLAGS_LONGLONG; break; +#if 0 case 'Z': if (sizeof(size_t) > sizeof(unsigned long int)) flags |= FLAGS_LONGLONG; if (sizeof(size_t) > sizeof(unsigned int)) flags |= FLAGS_LONG; break; +#endif case 'O': - if (sizeof(curl_off_t) > sizeof(unsigned long int)) { - flags |= FLAGS_LONGLONG; - } - else if (sizeof(curl_off_t) > sizeof(unsigned int)) { - flags |= FLAGS_LONG; - } +#if SIZEOF_CURL_OFF_T > 4 + flags |= FLAGS_LONGLONG; +#else + flags |= FLAGS_LONG; +#endif break; case '0': if (!(flags & FLAGS_LEFT))