diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-06-07 14:53:00 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-06-07 14:53:00 +0100 |
| commit | 9021fcfb883a17908a74a0ba1c09ff3b1bf97ebb (patch) | |
| tree | 47129c300bbb3950f5cc7566770e82560072faee /ui/curses.c | |
| parent | 33556237f652d8a712d0b6d29ecb442e6b65fe42 (diff) | |
| parent | 15ee0d9bc10b3de677ff6cd78b6dc9d5a7d40603 (diff) | |
Merge remote-tracking branch 'remotes/kraxel/tags/ui-20190607-pull-request' into staging
curses: 32bit build fix.
egl: dmabuf modifier support.
# gpg: Signature made Fri 07 Jun 2019 14:18:41 BST
# gpg: using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" [full]
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>" [full]
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>" [full]
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* remotes/kraxel/tags/ui-20190607-pull-request:
egl-helpers: add modifier support to egl_dmabuf_import_texture()
egl-helpers: add modifier support to egl_get_fd_for_texture().
vfio/display: set dmabuf modifier field
console: add dmabuf modifier field.
ui/curses: Fix build with -m32
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'ui/curses.c')
| -rw-r--r-- | ui/curses.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ui/curses.c b/ui/curses.c index 1f3fcabb00..e9319eb8ae 100644 --- a/ui/curses.c +++ b/ui/curses.c @@ -489,9 +489,9 @@ static uint16_t get_ucs(wchar_t wch, iconv_t conv) memset(&ps, 0, sizeof(ps)); ret = wcrtomb(mbch, wch, &ps); if (ret == -1) { - fprintf(stderr, "Could not convert 0x%04x " + fprintf(stderr, "Could not convert 0x%04lx " "from wchar_t to a multibyte character: %s\n", - wch, strerror(errno)); + (unsigned long)wch, strerror(errno)); return 0xFFFD; } @@ -501,9 +501,9 @@ static uint16_t get_ucs(wchar_t wch, iconv_t conv) such = sizeof(uch); if (iconv(conv, &pmbch, &smbch, &puch, &such) == (size_t) -1) { - fprintf(stderr, "Could not convert 0x%04x " + fprintf(stderr, "Could not convert 0x%04lx " "from a multibyte character to UCS-2 : %s\n", - wch, strerror(errno)); + (unsigned long)wch, strerror(errno)); return 0xFFFD; } |