From c35b288fccdbd17dd88f57c665d0b71739e8fc6c Mon Sep 17 00:00:00 2001 From: Simon Tatham Date: Wed, 9 Jul 2008 17:06:29 +0000 Subject: Turn the numeric parameter to err_sfntbadglyph from wchar_t to unsigned int, after a correspondent mentioned that DJGPP produces a very scary warning about integer promotion making use of the former in va_arg non-portable. Whether or not that's standards-justifiable, it's certainly the case that we were casting _to_ wchar_t from unsigned int in all cases of this error actually being used, so the simplest thing is just to transfer the number through va_arg as unsigned. [originally from svn r8112] --- error.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'error.c') diff --git a/error.c b/error.c index 2a2c6cd..7897d7a 100644 --- a/error.c +++ b/error.c @@ -18,7 +18,8 @@ static void do_error(int code, va_list ap) { char c; int i, j; char *sp, *sp2; - wchar_t *wsp, *wsp2, wc; + wchar_t *wsp, *wsp2; + unsigned wc; filepos fpos, fpos2, *fposp; int flags = 0; @@ -376,7 +377,7 @@ static void do_error(int code, va_list ap) { break; case err_sfntbadglyph: fpos = *va_arg(ap, filepos *); - wc = va_arg(ap, wchar_t); + wc = va_arg(ap, unsigned); sprintf(error, "warning: character U+%04X references an non-existent glyph", wc); -- cgit v1.1