From 5b6401b001c770f5426597175a90ba78ddca79ef Mon Sep 17 00:00:00 2001 From: YAMAMOTO Mitsuharu Date: Fri, 24 May 2019 09:52:56 +0900 Subject: [PATCH] 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. --- src/dispextern.h | 2 +- src/image.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/dispextern.h b/src/dispextern.h index ec1c9620be4..aa80fa653db 100644 --- 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 57b405f6db9..699bdfd4fa1 100644 --- 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; -- 2.39.2