diff options
| author | Adam Jackson <ajax@nwnk.net> | 2006-04-07 16:59:41 +0000 |
|---|---|---|
| committer | Adam Jackson <ajax@nwnk.net> | 2006-04-07 16:59:41 +0000 |
| commit | 33e65e5777eee4068c94dce408b5fd0e7796d3dd (patch) | |
| tree | ae73cfd27ef975b8c32a57acb701c1d252457644 | |
| parent | 02aa30ff4e50b05c84a422f167960415486ed066 (diff) | |
Unlibcwrap. Bump server version requirement. Bump to 1.1.0.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | src/DigitalEdge.c | 63 |
3 files changed, 10 insertions, 63 deletions
@@ -1,3 +1,9 @@ +2006-04-06 Adam Jackson <ajax@freedesktop.org> + + * configure.ac: + * src/DigitalEdge.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 17935c7..2dc6a4f 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-input-digitaledge], - 1.0.1.3, + 1.1.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-input-digitaledge) @@ -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/DigitalEdge.c b/src/DigitalEdge.c index 6e3eb20..2efe6c4 100644 --- a/src/DigitalEdge.c +++ b/src/DigitalEdge.c @@ -38,23 +38,14 @@ #include "xf86Version.h" -#if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(3,9,0,0,0) -#define XFREE86_V4 1 -#endif - -#ifdef XFREE86_V4 -/* post 3.9 headers */ - -#ifndef XFree86LOADER #include <unistd.h> #include <errno.h> -#endif +#include <string.h> #include "misc.h" #include "xf86.h" #define NEED_XF86_TYPES #if !defined(DGUX) -#include "xf86_ansic.h" #include "xisb.h" #endif #include "xf86_OSproc.h" @@ -100,56 +91,6 @@ static const char *default_options[] = static InputDriverPtr dedgeDrv; -#else /* pre 3.9 headers */ - -#include <X11/Xos.h> -#include <signal.h> -#include <stdio.h> - -#define NEED_EVENTS -#include <X11/X.h> -#include <X11/Xproto.h> -#include "misc.h" -#include "inputstr.h" -#include "scrnintstr.h" -#include <X11/extensions/XI.h> -#include <X11/extensions/XIproto.h> - -#if defined(sun) && !defined(i386) -#define POSIX_TTY -#include <errno.h> -#include <termio.h> -#include <fcntl.h> -#include <ctype.h> - -#include "extio.h" -#else -#include "compiler.h" - -#ifdef XFree86LOADER -#include "xf86_libc.h" -#endif -#include "xf86.h" -#include "xf86Procs.h" -#include "xf86_OSlib.h" -#include "xf86_Config.h" -#include "xf86Xinput.h" -#include "atKeynames.h" -#endif - -#if !defined(sun) || defined(i386) -#include "osdep.h" -#include "exevents.h" - -#include "extnsionst.h" -#include "extinit.h" -#endif - -#if defined(__QNX__) || defined(__QNXNTO__) -#define POSIX_TTY -#endif -#endif /* pre 3.9 headers */ - /* ** Debugging macros */ @@ -1460,7 +1401,7 @@ static XF86ModuleVersionInfo xf86SumVersionRec = MODINFOSTRING1, MODINFOSTRING2, XORG_VERSION_CURRENT, - 1, 0, 1, + 1, 1, 0, ABI_CLASS_XINPUT, ABI_XINPUT_VERSION, MOD_CLASS_XINPUT, |