From 32aaaaaa6b5a7f501e123b810b123be98836f332 Mon Sep 17 00:00:00 2001 From: Changyeon Lee Date: Wed, 9 Apr 2014 14:07:23 +0900 Subject: [PATCH] Imported Upstream version 1.0.4 --- configure.ac | 4 ++-- xkill.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 6b4bb5c..96b8882 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ dnl Process this file with autoconf to create configure. # Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([xkill], [1.0.3], +AC_INIT([xkill], [1.0.4], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xkill]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([config.h]) @@ -39,7 +39,7 @@ XORG_MACROS_VERSION(1.8) XORG_DEFAULT_OPTIONS # Checks for pkg-config packages -PKG_CHECK_MODULES(XKILL, [x11 xmuu xproto >= 7.0.17]) +PKG_CHECK_MODULES(XKILL, [x11 xmuu xproto >= 7.0.22]) AC_CONFIG_FILES([ Makefile diff --git a/xkill.c b/xkill.c index a4f5c48..2270dcd 100644 --- a/xkill.c +++ b/xkill.c @@ -241,9 +241,9 @@ parse_button(char *s, int *buttonp) for (cp = s; *cp; cp++) { if (isascii (*cp) && isupper (*cp)) { #ifdef _tolower - *cp = _tolower (*cp); + *cp = (char) _tolower (*cp); #else - *cp = tolower (*cp); + *cp = (char) tolower (*cp); #endif /* _tolower */ } } @@ -325,7 +325,7 @@ get_window_id(Display *dpy, int screen, int button, const char *msg) static int -catch_window_errors(Display *dpy, XErrorEvent *ev) +catch_window_errors(_X_UNUSED Display *dpy, _X_UNUSED XErrorEvent *ev) { return 0; } -- 2.7.4