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/dispextern.h | |
| parent | 21514da7b21e248fa5046ab27834fa431a34204c (diff) | |
| download | emacs-0766b489e1b34964bb43db221fe967d54ac5ec5e.tar.gz | |
* 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/dispextern.h')
| -rw-r--r-- | src/dispextern.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/dispextern.h b/src/dispextern.h index 227d5ed58e3..02f1e5314aa 100644 --- a/src/dispextern.h +++ b/src/dispextern.h @@ -1532,12 +1532,12 @@ struct face /* Background stipple or bitmap used for this face. This is an id as returned from load_pixmap. */ - int stipple; + ptrdiff_t stipple; #else /* not HAVE_WINDOW_SYSTEM */ /* Dummy. */ - int stipple; + ptrdiff_t stipple; #endif /* not HAVE_WINDOW_SYSTEM */ @@ -3082,21 +3082,21 @@ void w32_reset_fringes (void); #ifdef HAVE_WINDOW_SYSTEM -extern int x_bitmap_height (struct frame *, int); -extern int x_bitmap_width (struct frame *, int); -extern int x_bitmap_pixmap (struct frame *, int); +extern int x_bitmap_height (struct frame *, ptrdiff_t); +extern int x_bitmap_width (struct frame *, ptrdiff_t); +extern int x_bitmap_pixmap (struct frame *, ptrdiff_t); extern void x_reference_bitmap (struct frame *, int); -extern int x_create_bitmap_from_data (struct frame *, char *, - unsigned int, unsigned int); -extern int x_create_bitmap_from_file (struct frame *, Lisp_Object); +extern ptrdiff_t x_create_bitmap_from_data (struct frame *, char *, + unsigned int, unsigned int); +extern ptrdiff_t x_create_bitmap_from_file (struct frame *, Lisp_Object); #if defined HAVE_XPM && defined HAVE_X_WINDOWS && !defined USE_GTK -extern int x_create_bitmap_from_xpm_data (struct frame *f, const char **bits); +extern ptrdiff_t x_create_bitmap_from_xpm_data (struct frame *, const char **); #endif #ifndef x_destroy_bitmap -extern void x_destroy_bitmap (struct frame *, int); +extern void x_destroy_bitmap (struct frame *, ptrdiff_t); #endif extern void x_destroy_all_bitmaps (Display_Info *); -extern int x_create_bitmap_mask (struct frame * , int); +extern int x_create_bitmap_mask (struct frame *, ptrdiff_t); extern Lisp_Object x_find_image_file (Lisp_Object); void x_kill_gs_process (Pixmap, struct frame *); |