diff --git a/src/demo/reel.c b/src/demo/reel.c index 6cf05e185..f27971bbe 100644 --- a/src/demo/reel.c +++ b/src/demo/reel.c @@ -336,7 +336,7 @@ ncreel_demo_core(struct notcurses* nc){ break; case NCKEY_DEL: kill_active_tablet(pr, &tctxs); break; case NCKEY_RESIZE: notcurses_render(nc); break; - default: ncplane_printf_yx(std, 3, 2, "Unknown keycode (0x%x)\n", rw); break; + default: ncplane_printf_yx(std, 3, 2, "Unknown keycode (0x%lx)\n", (wint_t)rw); break; } if(newtablet){ newtablet->next = tctxs; diff --git a/src/demo/unicodeblocks.c b/src/demo/unicodeblocks.c index f965e9555..7779a14d9 100644 --- a/src/demo/unicodeblocks.c +++ b/src/demo/unicodeblocks.c @@ -67,7 +67,8 @@ draw_block(struct ncplane* nn, uint32_t blockstart){ if(bwc < 0){ fprintf(stderr, "Couldn't convert %u (%x) (%lc) (%s)\n", blockstart + chunk * CHUNKSIZE + z, - blockstart + chunk * CHUNKSIZE + z, w, strerror(errno)); + blockstart + chunk * CHUNKSIZE + z, + (wint_t)w, strerror(errno)); return -1; } if(wcwidth(w) < 2){ diff --git a/src/lib/metric.c b/src/lib/metric.c index e5642ea60..f2c456e29 100644 --- a/src/lib/metric.c +++ b/src/lib/metric.c @@ -69,9 +69,9 @@ const char *ncmetric(uintmax_t val, uintmax_t decimal, char *buf, int omitdec, // 1,024). That can overflow with large 64-bit values, but we can first // divide both sides by mult, and then scale by 100. if(omitdec && (val % dv) == 0){ - sprintfed = sprintf(buf, "%ju%lc", val / dv, prefixes[consumed - 1]); + sprintfed = sprintf(buf, "%ju%lc", val / dv, (wint_t)prefixes[consumed - 1]); }else{ - sprintfed = sprintf(buf, "%.2f%lc", (double)val / dv, prefixes[consumed - 1]); + sprintfed = sprintf(buf, "%.2f%lc", (double)val / dv, (wint_t)prefixes[consumed - 1]); } if(uprefix){ buf[sprintfed] = uprefix; @@ -83,13 +83,13 @@ const char *ncmetric(uintmax_t val, uintmax_t decimal, char *buf, int omitdec, // val / decimal < dv (or we ran out of prefixes) if(omitdec && val % decimal == 0){ if(consumed){ - sprintfed = sprintf(buf, "%ju%lc", val / decimal, subprefixes[consumed - 1]); + sprintfed = sprintf(buf, "%ju%lc", val / decimal, (wint_t)subprefixes[consumed - 1]); }else{ sprintf(buf, "%ju", val / decimal); } }else{ if(consumed){ - sprintfed = sprintf(buf, "%.2f%lc", (double)val / decimal, subprefixes[consumed - 1]); + sprintfed = sprintf(buf, "%.2f%lc", (double)val / decimal, (wint_t)subprefixes[consumed - 1]); }else{ sprintf(buf, "%.2f", (double)val / decimal); } diff --git a/src/poc/linuxconjammer.c b/src/poc/linuxconjammer.c index 0db7a4971..101dce5ee 100644 --- a/src/poc/linuxconjammer.c +++ b/src/poc/linuxconjammer.c @@ -217,7 +217,7 @@ jam_linux_consolemap(int fd, unsigned upper, unsigned lower){ for(int i = 0 ; i < map.entry_ct ; ++i){ wchar_t w = map.entries[i].unicode; printf(" %05hx (%lc)->%3hu ", map.entries[i].unicode, - iswprint(w) ? w : L' ', map.entries[i].fontpos); + (wint_t)(iswprint(w) ? w : L' '), map.entries[i].fontpos); if(i % 4 == 3){ printf("\n"); } diff --git a/src/poc/linuxconsole.c b/src/poc/linuxconsole.c index 477304d2f..0f1a5ad34 100644 --- a/src/poc/linuxconsole.c +++ b/src/poc/linuxconsole.c @@ -152,9 +152,9 @@ get_linux_consolemap(int fd){ } printf("Unicode->font entries: %hu\n", map.entry_ct); for(int i = 0 ; i < map.entry_ct ; ++i){ - wchar_t w = map.entries[i].unicode; + wint_t w = map.entries[i].unicode; printf(" %05hx (%lc)->%3hu ", map.entries[i].unicode, - iswprint(w) ? w : L' ', map.entries[i].fontpos); + (wint_t)(iswprint(w) ? w : L' '), map.entries[i].fontpos); if(i % 4 == 3){ printf("\n"); }