diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2012-05-15 05:59:30 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2012-05-15 05:59:30 +0000 |
| commit | e7448ed7cde82997782d1c0c0d1be2dcf7e48768 (patch) | |
| tree | 6cdf63aa603c4b534969aba6b36f596baa4ca475 /app/xinput/src | |
| parent | 30eb7c5f17173a13c25cc18c88e795186b76aeb6 (diff) | |
Update to xinput 1.5.4
Diffstat (limited to 'app/xinput/src')
| -rw-r--r-- | app/xinput/src/Makefile.in | 8 | ||||
| -rw-r--r-- | app/xinput/src/list.c | 6 |
2 files changed, 8 insertions, 6 deletions
diff --git a/app/xinput/src/Makefile.in b/app/xinput/src/Makefile.in index 4df8e67ac..d1f985f65 100644 --- a/app/xinput/src/Makefile.in +++ b/app/xinput/src/Makefile.in @@ -44,9 +44,9 @@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c +install_sh_DATA = ${SHELL} $(install_sh) -c -m 644 +install_sh_PROGRAM = ${SHELL} $(install_sh) -c +install_sh_SCRIPT = ${SHELL} $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) transform = $(program_transform_name) NORMAL_INSTALL = : @@ -107,6 +107,7 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BASE_CFLAGS = @BASE_CFLAGS@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -160,6 +161,7 @@ PKG_CONFIG = @PKG_CONFIG@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +STRICT_CFLAGS = @STRICT_CFLAGS@ STRIP = @STRIP@ VERSION = @VERSION@ XI2_CFLAGS = @XI2_CFLAGS@ diff --git a/app/xinput/src/list.c b/app/xinput/src/list.c index 7f882abed..d533db6f4 100644 --- a/app/xinput/src/list.c +++ b/app/xinput/src/list.c @@ -221,14 +221,14 @@ static int list_xi2(Display *display, int shortformat) { - int major = XI_2_Major, - minor = XI_2_Minor; + int major = 2, + minor = 0; int ndevices; int i, j; XIDeviceInfo *info, *dev; if (XIQueryVersion(display, &major, &minor) != Success || - (major * 1000 + minor) < (XI_2_Major * 1000 + XI_2_Minor)) + (major * 1000 + minor) < 2000) { fprintf(stderr, "XI2 not supported.\n"); return EXIT_FAILURE; |