diff options
| author | YAMAMOTO Mitsuharu | 2019-05-24 09:52:56 +0900 |
|---|---|---|
| committer | YAMAMOTO Mitsuharu | 2019-05-24 09:52:56 +0900 |
| commit | 5b6401b001c770f5426597175a90ba78ddca79ef (patch) | |
| tree | 2919a5f729ef45b7dbb39f2ed119ea3c43a5b5a1 /src | |
| parent | 84a3da15e96504cfcbaf295cfb0babca8d8700e5 (diff) | |
| download | emacs-5b6401b001c770f5426597175a90ba78ddca79ef.tar.gz emacs-5b6401b001c770f5426597175a90ba78ddca79ef.zip | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/dispextern.h | 2 | ||||
| -rw-r--r-- | 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); | |||
| 3396 | extern void image_destroy_all_bitmaps (Display_Info *); | 3396 | extern void image_destroy_all_bitmaps (Display_Info *); |
| 3397 | #ifdef HAVE_X_WINDOWS | 3397 | #ifdef HAVE_X_WINDOWS |
| 3398 | extern void x_create_bitmap_mask (struct frame *, ptrdiff_t); | 3398 | extern void x_create_bitmap_mask (struct frame *, ptrdiff_t); |
| 3399 | extern void x_kill_gs_process (Pixmap, struct frame *); | ||
| 3399 | #endif | 3400 | #endif |
| 3400 | extern Lisp_Object image_find_image_file (Lisp_Object); | 3401 | extern Lisp_Object image_find_image_file (Lisp_Object); |
| 3401 | 3402 | ||
| 3402 | void x_kill_gs_process (Emacs_Pixmap, struct frame *); | ||
| 3403 | struct image_cache *make_image_cache (void); | 3403 | struct image_cache *make_image_cache (void); |
| 3404 | void free_image_cache (struct frame *); | 3404 | void free_image_cache (struct frame *); |
| 3405 | void clear_image_caches (Lisp_Object); | 3405 | 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) | |||
| 9550 | telling Emacs that Ghostscript has finished drawing. */ | 9550 | telling Emacs that Ghostscript has finished drawing. */ |
| 9551 | 9551 | ||
| 9552 | void | 9552 | void |
| 9553 | x_kill_gs_process (Emacs_Pixmap pixmap, struct frame *f) | 9553 | x_kill_gs_process (Pixmap pixmap, struct frame *f) |
| 9554 | { | 9554 | { |
| 9555 | struct image_cache *c = FRAME_IMAGE_CACHE (f); | 9555 | struct image_cache *c = FRAME_IMAGE_CACHE (f); |
| 9556 | ptrdiff_t i; | 9556 | ptrdiff_t i; |