diff options
| author | Po Lu | 2022-01-08 15:27:50 +0800 |
|---|---|---|
| committer | Po Lu | 2022-01-08 15:27:50 +0800 |
| commit | 79cc87f3b7a90376b16c8e45bb94eccdab4458e9 (patch) | |
| tree | 7150bf7e285400e09b0803dc4cf64fb5c1a667a4 | |
| parent | d76fb0c11e9859db0d03d6496f5a720d304f4ca9 (diff) | |
| download | emacs-79cc87f3b7a90376b16c8e45bb94eccdab4458e9.tar.gz emacs-79cc87f3b7a90376b16c8e45bb94eccdab4458e9.zip | |
Fix build on PGTK
* src/gtkutil.c (xg_mark_data):
* src/gtkutil.h (xg_filter_key): Ifdef out definitions on PGTK.
| -rw-r--r-- | src/gtkutil.c | 2 | ||||
| -rw-r--r-- | src/gtkutil.h | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/gtkutil.c b/src/gtkutil.c index 4c516a4479a..f2362275147 100644 --- a/src/gtkutil.c +++ b/src/gtkutil.c | |||
| @@ -2956,6 +2956,7 @@ xg_mark_data (void) | |||
| 2956 | } | 2956 | } |
| 2957 | } | 2957 | } |
| 2958 | 2958 | ||
| 2959 | #ifndef HAVE_PGTK | ||
| 2959 | if (xg_pending_quit_event.kind != NO_EVENT) | 2960 | if (xg_pending_quit_event.kind != NO_EVENT) |
| 2960 | { | 2961 | { |
| 2961 | eassert (xg_pending_quit_event.kind == ASCII_KEYSTROKE_EVENT); | 2962 | eassert (xg_pending_quit_event.kind == ASCII_KEYSTROKE_EVENT); |
| @@ -2963,6 +2964,7 @@ xg_mark_data (void) | |||
| 2963 | mark_object (xg_pending_quit_event.frame_or_window); | 2964 | mark_object (xg_pending_quit_event.frame_or_window); |
| 2964 | mark_object (xg_pending_quit_event.arg); | 2965 | mark_object (xg_pending_quit_event.arg); |
| 2965 | } | 2966 | } |
| 2967 | #endif | ||
| 2966 | } | 2968 | } |
| 2967 | 2969 | ||
| 2968 | /* Callback called when a menu item is destroyed. Used to free data. | 2970 | /* Callback called when a menu item is destroyed. Used to free data. |
diff --git a/src/gtkutil.h b/src/gtkutil.h index a1dd281f1d3..b74244d84d0 100644 --- a/src/gtkutil.h +++ b/src/gtkutil.h | |||
| @@ -217,7 +217,9 @@ extern void xg_print_frames_dialog (Lisp_Object); | |||
| 217 | extern bool xg_is_menu_window (Display *dpy, Window); | 217 | extern bool xg_is_menu_window (Display *dpy, Window); |
| 218 | #endif | 218 | #endif |
| 219 | 219 | ||
| 220 | #ifndef HAVE_PGTK | ||
| 220 | extern bool xg_filter_key (struct frame *frame, XEvent *xkey); | 221 | extern bool xg_filter_key (struct frame *frame, XEvent *xkey); |
| 222 | #endif | ||
| 221 | 223 | ||
| 222 | /* Mark all callback data that are Lisp_object:s during GC. */ | 224 | /* Mark all callback data that are Lisp_object:s during GC. */ |
| 223 | extern void xg_mark_data (void); | 225 | extern void xg_mark_data (void); |