X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Flibgame%2Fx11.c;h=66f4a3efc69b597beabb09091e23a01a57b02025;hb=61c3da0;hp=f95c3da99e479ff9ce400a5b9fad1725d18c3dc7;hpb=e9306042d9ea3bc310590fe16653538905a9b99d;p=rocksndiamonds.git diff --git a/src/libgame/x11.c b/src/libgame/x11.c index f95c3da9..66f4a3ef 100644 --- a/src/libgame/x11.c +++ b/src/libgame/x11.c @@ -110,7 +110,7 @@ static DrawWindow *X11InitWindow() DrawWindow *new_window = CreateBitmapStruct(); unsigned int border_width = 4; XGCValues gc_values; - unsigned long gc_valuemask; + unsigned int gc_valuemask; #if !defined(PLATFORM_MSDOS) XTextProperty windowName, iconName; Pixmap icon_pixmap, iconmask_pixmap; @@ -121,13 +121,13 @@ static DrawWindow *X11InitWindow() XClassHint class_hints; char *window_name = program.window_title; char *icon_name = program.window_title; - long window_event_mask; + int window_event_mask; Atom proto_atom = None, delete_atom = None; #endif int screen_width, screen_height; int win_xpos, win_ypos; - unsigned long pen_fg = WhitePixel(display, screen); - unsigned long pen_bg = BlackPixel(display, screen); + unsigned int pen_fg = WhitePixel(display, screen); + unsigned int pen_bg = BlackPixel(display, screen); const int width = video.width, height = video.height; int i; @@ -289,7 +289,7 @@ Bitmap *X11LoadImage(char *filename) char *error = "Read_PCX_to_Pixmap(): %s '%s'"; int pcx_err; XGCValues clip_gc_values; - unsigned long clip_gc_valuemask; + unsigned int clip_gc_valuemask; pcx_err = Read_PCX_to_Pixmap(display, window->drawable, window->gc, filename, &new_bitmap->drawable, &new_bitmap->clip_mask);