aboutsummaryrefslogtreecommitdiffstats
path: root/src/lisp.h
diff options
context:
space:
mode:
authorPaul Eggert2011-06-21 23:16:16 -0700
committerPaul Eggert2011-06-21 23:16:16 -0700
commit0766b489e1b34964bb43db221fe967d54ac5ec5e (patch)
tree1de7cf403512dcf52d8d14dd3f05cc8065b8ad4a /src/lisp.h
parent21514da7b21e248fa5046ab27834fa431a34204c (diff)
downloademacs-0766b489e1b34964bb43db221fe967d54ac5ec5e.tar.gz
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/lisp.h')
-rw-r--r--src/lisp.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lisp.h b/src/lisp.h
index 99a276c805c..4c9543bdfe8 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -2628,7 +2628,7 @@ extern void init_fringe_once (void);
2628/* Defined in image.c */ 2628/* Defined in image.c */
2629extern Lisp_Object QCascent, QCmargin, QCrelief; 2629extern Lisp_Object QCascent, QCmargin, QCrelief;
2630extern Lisp_Object QCconversion; 2630extern Lisp_Object QCconversion;
2631extern int x_bitmap_mask (struct frame *, int); 2631extern int x_bitmap_mask (struct frame *, ptrdiff_t);
2632extern void syms_of_image (void); 2632extern void syms_of_image (void);
2633extern void init_image (void); 2633extern void init_image (void);
2634 2634