From 78f99be6753735a096c488e4940384aab75c3256 Mon Sep 17 00:00:00 2001 From: Po Lu Date: Sat, 26 Mar 2022 17:12:34 +0800 Subject: [PATCH] Minor fixes to last change * src/Makefile.in: Add XSHAPE_LIBS and XSHAPE_CFLAGS. (LIBES, EMACS_CFLAGS): Likewise. * src/xterm.c (x_dnd_compute_toplevels): Fix build without HAVE_XCB_SHAPE. --- src/Makefile.in | 7 +++++-- src/xterm.c | 3 +++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/Makefile.in b/src/Makefile.in index 0ec2d342646..69c4c44d1a0 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -274,6 +274,9 @@ XDBE_CFLAGS = @XDBE_CFLAGS@ XCOMPOSITE_LIBS = @XCOMPOSITE_LIBS@ XCOMPOSITE_CFLAGS = @XCOMPOSITE_CFLAGS@ +XSHAPE_LIBS = @XSHAPE_LIBS@ +XSHAPE_CFLAGS = @XSHAPE_CFLAGS@ + ## widget.o if USE_X_TOOLKIT, otherwise empty. WIDGET_OBJ=@WIDGET_OBJ@ @@ -405,7 +408,7 @@ EMACS_CFLAGS=-Demacs $(MYCPPFLAGS) -I. -I$(srcdir) \ $(HARFBUZZ_CFLAGS) $(LIBOTF_CFLAGS) $(M17N_FLT_CFLAGS) $(DEPFLAGS) \ $(LIBSYSTEMD_CFLAGS) $(JSON_CFLAGS) $(XSYNC_CFLAGS) \ $(LIBGNUTLS_CFLAGS) $(NOTIFY_CFLAGS) $(CAIRO_CFLAGS) \ - $(WERROR_CFLAGS) $(HAIKU_CFLAGS) $(XCOMPOSITE_CFLAGS) + $(WERROR_CFLAGS) $(HAIKU_CFLAGS) $(XCOMPOSITE_CFLAGS) $(XSHAPE_CFLAGS) ALL_CFLAGS = $(EMACS_CFLAGS) $(WARN_CFLAGS) $(CFLAGS) ALL_OBJC_CFLAGS = $(EMACS_CFLAGS) \ $(filter-out $(NON_OBJC_CFLAGS),$(WARN_CFLAGS)) $(CFLAGS) \ @@ -562,7 +565,7 @@ LIBES = $(LIBS) $(W32_LIBS) $(LIBS_GNUSTEP) $(PGTK_LIBS) $(LIBX_BASE) $(LIBIMAGE $(LIBGNUTLS_LIBS) $(LIB_PTHREAD) $(GETADDRINFO_A_LIBS) $(LCMS2_LIBS) \ $(NOTIFY_LIBS) $(LIB_MATH) $(LIBZ) $(LIBMODULES) $(LIBSYSTEMD_LIBS) \ $(JSON_LIBS) $(LIBGMP) $(LIBGCCJIT_LIBS) $(XINPUT_LIBS) $(HAIKU_LIBS) \ - $(SQLITE3_LIBS) $(XCOMPOSITE_LIBS) + $(SQLITE3_LIBS) $(XCOMPOSITE_LIBS) $(XSHAPE_LIBS) ## FORCE it so that admin/unidata can decide whether this file is ## up-to-date. Although since charprop depends on bootstrap-emacs, diff --git a/src/xterm.c b/src/xterm.c index e448c177c0a..9d66181de40 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -966,8 +966,11 @@ x_dnd_compute_toplevels (struct x_display_info *dpyinfo) = alloca (sizeof *get_property_cookies * nitems); get_geometry_cookies = alloca (sizeof *get_geometry_cookies * nitems); + +#ifdef HAVE_XCB_SHAPE bounding_rect_cookies = alloca (sizeof *bounding_rect_cookies * nitems); +#endif #ifdef HAVE_XCB_SHAPE_INPUT_RECTS input_rect_cookies -- 2.39.2