diff --git a/licence.c b/licence.c index a84a7dc..9a89ad2 100644 --- a/licence.c +++ b/licence.c @@ -53,7 +53,7 @@ static void licence_generate_hwid(uint8 * hwid) { buf_out_uint32(hwid, 2); - strncpy(hwid + 4, hostname, LICENCE_HWID_SIZE - 4); + strncpy((char *)(hwid + 4), hostname, LICENCE_HWID_SIZE - 4); } /* Present an existing licence to the server */ diff --git a/xkeymap.c b/xkeymap.c index 0363b3b..caf0895 100644 --- a/xkeymap.c +++ b/xkeymap.c @@ -38,7 +38,7 @@ extern int keylayout; extern BOOL enable_compose; static key_translation keymap[KEYMAP_SIZE]; -static unsigned int min_keycode; +static int min_keycode; static uint16 remote_modifier_state = 0; static void @@ -220,7 +220,7 @@ void xkeymap_init2(void) { unsigned int max_keycode; - XDisplayKeycodes(display, &min_keycode, &max_keycode); + XDisplayKeycodes(display, &min_keycode, (int *)&max_keycode); } diff --git a/xwin.c b/xwin.c index 0805c43..ac16117 100644 --- a/xwin.c +++ b/xwin.c @@ -589,8 +589,8 @@ ui_create_bitmap(int width, int height, uint8 * data) tdata = (owncolmap ? data : translate_image(width, height, data)); bitmap = XCreatePixmap(display, wnd, width, height, depth); - image = XCreateImage(display, visual, depth, ZPixmap, 0, tdata, width, - height, 8, 0); + image = XCreateImage(display, visual, depth, ZPixmap, 0, (char *)tdata, + width, height, 8, 0); XPutImage(display, bitmap, gc, image, 0, 0, 0, 0, width, height); @@ -608,8 +608,8 @@ ui_paint_bitmap(int x, int y, int cx, int cy, int width, int height, uint8 *tdata; tdata = (owncolmap ? data : translate_image(width, height, data)); - image = XCreateImage(display, visual, depth, ZPixmap, 0, tdata, width, - height, 8, 0); + image = XCreateImage(display, visual, depth, ZPixmap, 0, (char *)tdata, + width, height, 8, 0); if (ownbackstore) { @@ -645,8 +645,8 @@ ui_create_glyph(int width, int height, uint8 * data) bitmap = XCreatePixmap(display, wnd, width, height, 1); gc = XCreateGC(display, bitmap, 0, NULL); - image = XCreateImage(display, visual, 1, ZPixmap, 0, data, width, - height, 8, scanline); + image = XCreateImage(display, visual, 1, ZPixmap, 0, (char *)data, + width, height, 8, scanline); image->byte_order = MSBFirst; image->bitmap_bit_order = MSBFirst; XInitImage(image); @@ -1157,8 +1157,8 @@ ui_desktop_restore(uint32 offset, int x, int y, int cx, int cy) if (data == NULL) return; - image = XCreateImage(display, visual, depth, ZPixmap, 0, data, cx, cy, - BitmapPad(display), cx * bpp / 8); + image = XCreateImage(display, visual, depth, ZPixmap, 0, (char *)data, + cx, cy, BitmapPad(display), cx * bpp / 8); if (ownbackstore) {