Image consolidation:

(x_bitmap_height, x_bitmap_width, x_bitmap_pixmap)
(x_reference_bitmap, x_create_bitmap_from_data)
(x_create_bitmap_from_file, x_destroy_bitmap)
(x_create_bitmap_mask): Move prototypes from dispextern.h.
(gamma_correct) [MAC_OS]: Add prototype.

diff --git a/src/dispextern.h b/src/dispextern.h
index bb421e0618b524e512b34c32ff4eee796e45c687..8eabbe34a7a1b467ee3d4c3d36314f35986c2316 100644 (file)
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -2595,6 +2595,21 @@ void w32_init_fringe P_ ((void));
 void w32_reset_fringes P_ ((void));
 #endif
 
+/* Defined in image.c */
+
+extern int x_bitmap_height P_ ((struct frame *, int));
+extern int x_bitmap_width P_ ((struct frame *, int));
+extern int x_bitmap_pixmap P_ ((struct frame *, int));
+extern void x_reference_bitmap P_ ((struct frame *, int));
+extern int x_create_bitmap_from_data P_ ((struct frame *, char *,
+                                         unsigned int, unsigned int));
+extern int x_create_bitmap_from_file P_ ((struct frame *, Lisp_Object));
+#ifndef x_destroy_bitmap
+extern void x_destroy_bitmap P_ ((struct frame *, int));
+#endif
+extern void x_destroy_all_bitmaps P_ ((Display_Info *));
+extern int x_create_bitmap_mask P_ ((struct frame * , int));
+
 /* Defined in sysdep.c */
 
 void get_frame_size P_ ((int *, int *));
@@ -2647,6 +2662,9 @@ void gamma_correct P_ ((struct frame *, XColor *));
 #ifdef WINDOWSNT
 void gamma_correct P_ ((struct frame *, COLORREF *));
 #endif
+#ifdef MAC_OS
+void gamma_correct P_ ((struct frame *, unsigned long *));
+#endif
 
 #ifdef HAVE_WINDOW_SYSTEM