summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2013-01-03 19:51:06 -0800
committerAlan Coopersmith <alan.coopersmith@oracle.com>2013-01-03 19:51:06 -0800
commit99ca5c8deb4a3ebd4b2a7e64bd64ca9a91b6680c (patch)
tree1f0babab297caf95529ae59cdad3cbf3d58c2d05
parent94c5e76c2d1043a835b0872f78902ebdfc3c5492 (diff)
Mark a couple parameters as unused to silence compiler warnings
ico.c:436:20: warning: unused parameter 'display' [-Wunused-parameter] predicate(Display *display, XEvent *event, XPointer args) ico.c:511:51: warning: unused parameter 'firsttime' [-Wunused-parameter] setDisplayBuf(struct closure *closure, int n, int firsttime) Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-rw-r--r--configure.ac2
-rw-r--r--ico.c8
2 files changed, 7 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index 284214a..d0a66c0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,7 +36,7 @@ XORG_DEFAULT_OPTIONS
AC_CONFIG_HEADERS([config.h])
# Checks for pkg-config packages
-PKG_CHECK_MODULES(ICO, [x11 >= 0.99.1 xproto >= 7.0.17])
+PKG_CHECK_MODULES(ICO, [x11 >= 0.99.1 xproto >= 7.0.22])
XTHREADLIB=`$PKG_CONFIG --variable=xthreadlib x11`
AC_SUBST(XTHREADLIB)
diff --git a/ico.c b/ico.c
index 0d5ad47..10c8c5e 100644
--- a/ico.c
+++ b/ico.c
@@ -433,7 +433,7 @@ PartialNonHomTransform(int n, Transform3D m, const Point3D *in, Point3D *out)
*/
static Bool
-predicate(Display *display, XEvent *event, XPointer args)
+predicate(_X_UNUSED Display *display, XEvent *event, XPointer args)
{
Window w = (Window) args;
return event->xany.window == w;
@@ -508,7 +508,11 @@ setDrawBuf (struct closure *closure, int n)
}
static void
-setDisplayBuf(struct closure *closure, int n, int firsttime)
+setDisplayBuf(struct closure *closure, int n,
+#ifndef MULTIBUFFER
+ _X_UNUSED
+#endif
+ int firsttime)
{
#ifdef MULTIBUFFER
if (multibufext && dblbuf) {