diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-06-21 23:16:16 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-06-21 23:16:16 -0700 |
| commit | 0766b489e1b34964bb43db221fe967d54ac5ec5e (patch) | |
| tree | 1de7cf403512dcf52d8d14dd3f05cc8065b8ad4a /src/w32term.h | |
| parent | 21514da7b21e248fa5046ab27834fa431a34204c (diff) | |
| download | emacs-0766b489e1b34964bb43db221fe967d54ac5ec5e.tar.gz emacs-0766b489e1b34964bb43db221fe967d54ac5ec5e.tar.bz2 emacs-0766b489e1b34964bb43db221fe967d54ac5ec5e.zip | |
* dispextern.h (struct face.stipple):
* image.c (x_bitmap_height, x_bitmap_width, x_bitmap_pixmap)
(x_bitmap_mask, x_allocate_bitmap_record)
(x_create_bitmap_from_data, x_create_bitmap_from_file)
(x_destroy_bitmap, x_destroy_all_bitmaps, x_create_bitmap_mask)
(x_create_bitmap_from_xpm_data):
* nsterm.h (struct ns_display_info.bitmaps_size, .bitmaps_last):
* w32term.h (struct w32_display_info.icon_bitmap_id, .bitmaps_size)
(.bitmaps_last):
* xfaces.c (load_pixmap):
* xterm.c (x_bitmap_icon, x_wm_set_icon_pixmap):
* xterm.h (struct x_display_info.icon_bitmap_id, .bitmaps_size)
(.bitmaps_last, struct x_output.icon_bitmap):
Use ptrdiff_t, not int, for bitmap indexes.
(x_allocate_bitmap_record): Check for size overflow.
* dispextern.h, lisp.h: Adjust to API changes elsewhere.
Diffstat (limited to 'src/w32term.h')
| -rw-r--r-- | src/w32term.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/w32term.h b/src/w32term.h index cf6751b7d63..24a2be7dca9 100644 --- a/src/w32term.h +++ b/src/w32term.h @@ -103,7 +103,7 @@ struct w32_display_info /* Emacs bitmap-id of the default icon bitmap for this frame. Or -1 if none has been allocated yet. */ - int icon_bitmap_id; + ptrdiff_t icon_bitmap_id; /* The root window of this screen. */ Window root_window; @@ -151,10 +151,10 @@ struct w32_display_info struct w32_bitmap_record *bitmaps; /* Allocated size of bitmaps field. */ - int bitmaps_size; + ptrdiff_t bitmaps_size; /* Last used bitmap index. */ - int bitmaps_last; + ptrdiff_t bitmaps_last; /* The frame (if any) which has the window that has keyboard focus. Zero if none. This is examined by Ffocus_frame in w32fns.c. Note |