From: Po Lu Date: Fri, 26 Nov 2021 09:42:51 +0000 (+0800) Subject: Make XInput 2 builds work without cairo X-Git-Tag: emacs-29.0.90~2852^2~22 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c56e05b968d437b807a194ecdcd308b045143846;p=emacs.git 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. --- 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) dpyinfo->ext_codes = ext_codes; } +#endif /* HAVE_CAIRO */ #ifdef HAVE_XINPUT2 @@ -564,6 +565,8 @@ xi_reset_scroll_valuators_for_device_id (struct x_display_info *dpyinfo, int id) #endif +#ifdef USE_CAIRO + void x_cr_destroy_frame_context (struct frame *f) {