diff options
| author | Adam Jackson <ajax@nwnk.net> | 2006-04-07 17:32:14 +0000 |
|---|---|---|
| committer | Adam Jackson <ajax@nwnk.net> | 2006-04-07 17:32:14 +0000 |
| commit | 5eb263e776a8193035d86a17fc3939e5fcf0c26d (patch) | |
| tree | 895b38a04fdc33d37924d744668cc5ab34cb0c2d | |
| parent | 717318ea9f56e7875f31906afd4b5669191df3cc (diff) | |
Unlibcwrap. Bump server version requirement. Bump to 1.1.0.xf86-video-impact-0_2_0fpit-1_1_0XORG-7_1
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | src/xf86Fpit.c | 10 |
3 files changed, 12 insertions, 8 deletions
@@ -1,3 +1,9 @@ +2006-04-06 Adam Jackson <ajax@freedesktop.org> + + * configure.ac: + * src/xf86Fpit.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 fdd0f7d..693ad9e 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-input-fpit], - 1.0.0.5, + 1.1.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-input-fpit) @@ -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/xf86Fpit.c b/src/xf86Fpit.c index 3934187..b7a9a60 100644 --- a/src/xf86Fpit.c +++ b/src/xf86Fpit.c @@ -57,15 +57,13 @@ #include <xf86Version.h> -# ifndef XFree86LOADER -# include <unistd.h> -# include <errno.h> -# endif +#include <unistd.h> +#include <errno.h> +#include <string.h> # include <misc.h> # include <xf86.h> # if !defined(DGUX) -# include <xf86_ansic.h> # endif # include <xf86_OSproc.h> # include <xf86Xinput.h> @@ -597,7 +595,7 @@ static void Unplug(pointer p) } static XF86ModuleVersionInfo version_rec = { - "fpit", MODULEVENDORSTRING, MODINFOSTRING1, MODINFOSTRING2, XORG_VERSION_CURRENT, 1, 0, 0, ABI_CLASS_XINPUT, ABI_XINPUT_VERSION, MOD_CLASS_XINPUT, + "fpit", MODULEVENDORSTRING, MODINFOSTRING1, MODINFOSTRING2, XORG_VERSION_CURRENT, 1, 1, 0, ABI_CLASS_XINPUT, ABI_XINPUT_VERSION, MOD_CLASS_XINPUT, {0, 0, 0, 0} }; |