From 352885a4ff166cd065da1944649a4f12801dd4d2 Mon Sep 17 00:00:00 2001
From: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon, 21 Nov 2022 11:54:58 -0800
Subject: XCompositeCloseDisplay: Mark codes as unused

Quiets clang warning:

Xcomposite.c:91:50: warning: unused parameter 'codes' [-Wunused-parameter]
XCompositeCloseDisplay (Display *dpy, XExtCodes *codes)
                                                 ^

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
---
 configure.ac        | 3 ++-
 src/Xcomposite.c    | 2 +-
 src/xcompositeint.h | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index d62be07..81fd884 100644
--- a/configure.ac
+++ b/configure.ac
@@ -63,7 +63,8 @@ COMPOSITEEXT_VERSION=[`echo $VERSION | sed 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\
 AC_SUBST(COMPOSITEEXT_VERSION)
 
 # Obtain compiler/linker options for dependencies
-PKG_CHECK_MODULES(XCOMPOSITE, [compositeproto >= $COMPOSITEEXT_VERSION] x11)
+PKG_CHECK_MODULES(XCOMPOSITE,
+        [compositeproto >= $COMPOSITEEXT_VERSION xproto >= 7.0.22 x11])
 PKG_CHECK_MODULES(XFIXES, xfixes)
 
 AC_CONFIG_FILES([Makefile
diff --git a/src/Xcomposite.c b/src/Xcomposite.c
index 81cda1c..4208263 100644
--- a/src/Xcomposite.c
+++ b/src/Xcomposite.c
@@ -88,7 +88,7 @@ XCompositeExtRemoveDisplay (XCompositeExtInfo *extinfo, const Display *dpy)
 }
 
 static int
-XCompositeCloseDisplay (Display *dpy, XExtCodes *codes)
+XCompositeCloseDisplay (Display *dpy, _X_UNUSED XExtCodes *codes)
 {
     return XCompositeExtRemoveDisplay (&XCompositeExtensionInfo, dpy);
 }
diff --git a/src/xcompositeint.h b/src/xcompositeint.h
index c2247bf..6e48105 100644
--- a/src/xcompositeint.h
+++ b/src/xcompositeint.h
@@ -46,6 +46,7 @@
 #define _XCOMPOSITEINT_H_
 
 #include <stdio.h>
+#include <X11/Xfuncproto.h>
 #include <X11/Xlib.h>
 #include <X11/Xlibint.h>
 #include <X11/Xutil.h>
-- 
cgit v1.2.1