diff options
| author | Adam Jackson <ajax@nwnk.net> | 2006-04-07 18:06:50 +0000 |
|---|---|---|
| committer | Adam Jackson <ajax@nwnk.net> | 2006-04-07 18:06:50 +0000 |
| commit | f661f8975ff3940d8bff03e4090f235fe18a682e (patch) | |
| tree | 55e816a05e192b63ed62e56ea9a3159f913d5335 | |
| parent | 68ee6b856239014ce271102d63431bedf99f3f4e (diff) | |
Unlibcwrap. Bump server version requirement. Bump to 1.1.0.penmount-1_1_0XORG-7_1
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | src/xf86PM.c | 5 |
3 files changed, 10 insertions, 5 deletions
@@ -1,3 +1,9 @@ +2006-04-06 Adam Jackson <ajax@freedesktop.org> + + * configure.ac: + * src/xf86PM.c: + Unlibcwrap. Bump server version requirement. Bump to 1.1.0. + 2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org> * configure.ac: diff --git a/configure.ac b/configure.ac index 8e9598e..ca046d6 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-input-penmount], - 1.0.0.5, + 1.1.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-input-penmount) @@ -75,7 +75,7 @@ XORG_DRIVER_CHECK_EXT(RANDR, randrproto) XORG_DRIVER_CHECK_EXT(XINPUT, inputproto) # Checks for pkg-config packages -PKG_CHECK_MODULES(XORG, xorg-server xproto $REQUIRED_MODULES) +PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto $REQUIRED_MODULES) sdkdir=$(pkg-config --variable=sdkdir xorg-server) CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src' diff --git a/src/xf86PM.c b/src/xf86PM.c index 0ea8f3b..1ea4879 100644 --- a/src/xf86PM.c +++ b/src/xf86PM.c @@ -39,12 +39,11 @@ #include <misc.h> #include <xf86.h> #define NEED_XF86_TYPES -#include <xf86_ansic.h> #include <xf86_OSproc.h> #include <xf86Xinput.h> #include <xisb.h> #include <exevents.h> - +#include <string.h> #include "xf86PM.h" _X_EXPORT InputDriverRec PENMOUNT = { @@ -68,7 +67,7 @@ static XF86ModuleVersionInfo VersionRec = MODINFOSTRING1, MODINFOSTRING2, XORG_VERSION_CURRENT, - 1, 0, 0, + 1, 1, 0, ABI_CLASS_XINPUT, ABI_XINPUT_VERSION, MOD_CLASS_XINPUT, |