summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2022-11-12 12:06:50 -0800
committerAlan Coopersmith <alan.coopersmith@oracle.com>2022-11-13 14:19:10 -0800
commitb8058f42a84f4930c074860bec5854c4ff818463 (patch)
tree9ea9be116633ea7c33ccde17b17061f9472f16ff
parent80b0b8c0a839b45a261d32b1cd1152257e16aa10 (diff)
premultiply_data(): Mark png argument unused
Clears clang warning: xcursorgen.c:152:30: warning: unused parameter 'png' [-Wunused-parameter] premultiply_data(png_structp png, png_row_infop row_info, png_bytep data) ^ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-rw-r--r--configure.ac2
-rw-r--r--xcursorgen.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index 15b075e..bee5090 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@ XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
# Checks for pkg-config packages
-PKG_CHECK_MODULES(XCURSORGEN, x11 xcursor libpng >= 1.2.0)
+PKG_CHECK_MODULES(XCURSORGEN, [x11 xcursor libpng >= 1.2.0 xproto >= 7.0.22])
AC_CHECK_FUNCS([asprintf])
diff --git a/xcursorgen.c b/xcursorgen.c
index d6e23a6..4ed63d1 100644
--- a/xcursorgen.c
+++ b/xcursorgen.c
@@ -30,6 +30,7 @@
#include <ctype.h>
#include <errno.h>
+#include <X11/Xfuncproto.h>
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <X11/Xcursor/Xcursor.h>
@@ -149,7 +150,8 @@ read_config_file(const char *config, struct flist **list)
#define div_255(x) (((x) + 0x80 + (((x) + 0x80) >> 8)) >> 8)
static void
-premultiply_data(png_structp png, png_row_infop row_info, png_bytep data)
+premultiply_data(png_structp png _X_UNUSED, png_row_infop row_info,
+ png_bytep data)
{
png_size_t i;