Undo use of Emacs_Pixmap over Pixmap for x_kill_gs_process

* src/dispextern.h (x_kill_gs_process):
* src/image.c (x_kill_gs_process): Undo use of Emacs_Pixmap over Pixmap.
* src/dispextern.h (x_kill_gs_process): Move extern inside HAVE_X_WINDOWS.

diff --git a/src/dispextern.h b/src/dispextern.h
index ec1c9620be494615c6e34ca236099d5b2d4fbf3d..aa80fa653dbf4fd49447525d600d87f394f89389 100644 (file)
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -3396,10 +3396,10 @@ extern void image_destroy_bitmap (struct frame *, ptrdiff_t);
 extern void image_destroy_all_bitmaps (Display_Info *);
 #ifdef HAVE_X_WINDOWS
 extern void x_create_bitmap_mask (struct frame *, ptrdiff_t);
+extern void x_kill_gs_process (Pixmap, struct frame *);
 #endif
 extern Lisp_Object image_find_image_file (Lisp_Object);
 
-void x_kill_gs_process (Emacs_Pixmap, struct frame *);
 struct image_cache *make_image_cache (void);
 void free_image_cache (struct frame *);
 void clear_image_caches (Lisp_Object);

diff --git a/src/image.c b/src/image.c
index 57b405f6db959a221b43e41b581199ca71ca1581..699bdfd4fa1d1fe12d0318526b69b218b31616e1 100644 (file)
--- a/src/image.c
+++ b/src/image.c
@@ -9550,7 +9550,7 @@ gs_load (struct frame *f, struct image *img)
    telling Emacs that Ghostscript has finished drawing.  */
 
 void
-x_kill_gs_process (Emacs_Pixmap pixmap, struct frame *f)
+x_kill_gs_process (Pixmap pixmap, struct frame *f)
 {
   struct image_cache *c = FRAME_IMAGE_CACHE (f);
   ptrdiff_t i;