Move image related prototypes from xfns.c section to image.c.

Condition them by HAVE_WINDOW_SYSTEM rather than HAVE_X_WINDOWS.

1 files changed, 19 insertions, 16 deletions

diff --git a/src/dispextern.h b/src/dispextern.h
index 8eabbe34a7a..0fb58d4a1d1 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -2597,6 +2597,8 @@ void w32_reset_fringes P_ ((void));
 
 /* Defined in image.c */
 
+#ifdef HAVE_WINDOW_SYSTEM
+
 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));
@@ -2610,6 +2612,23 @@ extern void x_destroy_bitmap P_ ((struct frame *, int));
 extern void x_destroy_all_bitmaps P_ ((Display_Info *));
 extern int x_create_bitmap_mask P_ ((struct frame * , int));
 
+void x_kill_gs_process P_ ((Pixmap, struct frame *));
+struct image_cache *make_image_cache P_ ((void));
+void free_image_cache P_ ((struct frame *));
+void clear_image_cache P_ ((struct frame *, int));
+void forall_images_in_image_cache P_ ((struct frame *,
+                                       void (*) P_ ((struct image *))));
+int valid_image_p P_ ((Lisp_Object));
+void prepare_image_for_display P_ ((struct frame *, struct image *));
+int lookup_image P_ ((struct frame *, Lisp_Object));
+
+unsigned long image_background P_ ((struct image *, struct frame *,
+                                    XImage *ximg));
+int image_background_transparent P_ ((struct image *, struct frame *,
+                                      XImage *mask));
+
+#endif
+
 /* Defined in sysdep.c */
 
 void get_frame_size P_ ((int *, int *));
@@ -2668,24 +2687,8 @@ void gamma_correct P_ ((struct frame *, unsigned long *));
 
 #ifdef HAVE_WINDOW_SYSTEM
 
-void x_kill_gs_process P_ ((Pixmap, struct frame *));
 int x_screen_planes P_ ((struct frame *));
 void x_implicitly_set_name P_ ((struct frame *, Lisp_Object, Lisp_Object));
-struct image_cache *make_image_cache P_ ((void));
-void free_image_cache P_ ((struct frame *));
-void clear_image_cache P_ ((struct frame *, int));
-void forall_images_in_image_cache P_ ((struct frame *,
-                                       void (*) P_ ((struct image *))));
-int valid_image_p P_ ((Lisp_Object));
-void prepare_image_for_display P_ ((struct frame *, struct image *));
-int lookup_image P_ ((struct frame *, Lisp_Object));
-
-#ifdef HAVE_X_WINDOWS
-unsigned long image_background P_ ((struct image *, struct frame *,
-                                    XImage *ximg));
-int image_background_transparent P_ ((struct image *, struct frame *,
-                                      XImage *mask));
-#endif /* HAVE_X_WINDOWS */
 
 extern Lisp_Object tip_frame;
 extern Window tip_window;