diff options
| author | Po Lu | 2021-11-26 17:42:51 +0800 |
|---|---|---|
| committer | Po Lu | 2021-11-26 17:54:24 +0800 |
| commit | c56e05b968d437b807a194ecdcd308b045143846 (patch) | |
| tree | 1faf91d1c13c9e5356d75a6c0577ced166edd990 | |
| parent | 3e40a56d52b932fa13d3093e15e39277a6684fec (diff) | |
| download | emacs-c56e05b968d437b807a194ecdcd308b045143846.tar.gz emacs-c56e05b968d437b807a194ecdcd308b045143846.zip | |
Make XInput 2 builds work without cairo
* src/xterm.c: Move some defines around so XI2 code doesn't
get ifdef'd out if Cairo is disabled.
| -rw-r--r-- | src/xterm.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/xterm.c b/src/xterm.c index 0a3aeeed703..821c92c4dda 100644 --- a/src/xterm.c +++ b/src/xterm.c | |||
| @@ -345,6 +345,7 @@ x_extension_initialize (struct x_display_info *dpyinfo) | |||
| 345 | dpyinfo->ext_codes = ext_codes; | 345 | dpyinfo->ext_codes = ext_codes; |
| 346 | } | 346 | } |
| 347 | 347 | ||
| 348 | #endif /* HAVE_CAIRO */ | ||
| 348 | 349 | ||
| 349 | #ifdef HAVE_XINPUT2 | 350 | #ifdef HAVE_XINPUT2 |
| 350 | 351 | ||
| @@ -564,6 +565,8 @@ xi_reset_scroll_valuators_for_device_id (struct x_display_info *dpyinfo, int id) | |||
| 564 | 565 | ||
| 565 | #endif | 566 | #endif |
| 566 | 567 | ||
| 568 | #ifdef USE_CAIRO | ||
| 569 | |||
| 567 | void | 570 | void |
| 568 | x_cr_destroy_frame_context (struct frame *f) | 571 | x_cr_destroy_frame_context (struct frame *f) |
| 569 | { | 572 | { |