diff options
author | Peter Hutterer <peter@cs.unisa.edu.au> | 2008-05-12 17:30:15 +0930 |
---|---|---|
committer | Peter Hutterer <peter@cs.unisa.edu.au> | 2008-05-12 17:30:15 +0930 |
commit | c6df1392e52b5edf3f25e0198c06a3a1ae3c0356 (patch) | |
tree | ef1b2e70482c246edbbe3dea196e85717f27e964 | |
parent | f6e41306f76de966884d4b72c5fb5e5d6d534ce4 (diff) | |
parent | 852568991b251e9366da167f1b746a0a1db6adf0 (diff) | |
download | xorg-proto-inputproto-c6df1392e52b5edf3f25e0198c06a3a1ae3c0356.tar.gz |
Merge branch 'master' into mpx
Conflicts:
XI.h
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | Makefile.am | 10 | ||||
-rw-r--r-- | XI.h | 17 | ||||
-rw-r--r-- | configure.ac | 2 |
5 files changed, 21 insertions, 13 deletions
@@ -8,3 +8,4 @@ configure install-sh missing inputproto.pc +*~ diff --git a/ChangeLog b/ChangeLog deleted file mode 100644 index c722b51..0000000 --- a/ChangeLog +++ /dev/null @@ -1,4 +0,0 @@ -2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org> - - * configure.ac: - Update package version number for final X11R7 release candidate. diff --git a/Makefile.am b/Makefile.am index 7dc142c..1d103ff 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,3 +7,13 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = inputproto.pc EXTRA_DIST = autogen.sh inputproto.pc.in + +EXTRA_DIST += ChangeLog +MAINTAINERCLEANFILES = ChangeLog + +.PHONY: ChangeLog + +ChangeLog: + (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2) + +dist-hook: ChangeLog @@ -1,5 +1,3 @@ -/* $Xorg: XI.h,v 1.4 2001/02/09 02:03:23 xorgcvs Exp $ */ - /************************************************************ Copyright 1989, 1998 The Open Group @@ -45,7 +43,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/include/extensions/XI.h,v 1.4 2001/01/17 17:53:16 dawes Exp $ */ /* Definitions used by the server, library and client */ @@ -53,8 +50,8 @@ SOFTWARE. #define _XI_H_ #include <X11/Xmd.h> -#define sz_xGetExtensionVersionReq 8 -#define sz_xGetExtensionVersionReply 32 +#define sz_xGetExtensionVersionReq 8 +#define sz_xGetExtensionVersionReply 32 #define sz_xListInputDevicesReq 4 #define sz_xListInputDevicesReply 32 #define sz_xOpenDeviceReq 8 @@ -315,13 +312,17 @@ SOFTWARE. #define XI_DeviceClassesChangedMask (1 << 1) -/* Make XEventClass be a CARD32 for 64 bit servers. Don't affect client +/* + * Make XEventClass be a CARD32 for 64 bit servers. Don't affect client * definition of XEventClass since that would be a library interface change. * See the top of X.h for more _XSERVER64 magic. + * + * But, don't actually use the CARD32 type. We can't get it defined here + * without polluting the namespace. */ #ifdef _XSERVER64 -typedef CARD32 XEventClass; -typedef CARD32 ValuatorData; +typedef unsigned int XEventClass; +typedef unsigned int ValuatorData; #else typedef unsigned long XEventClass; typedef unsigned long ValuatorData; diff --git a/configure.ac b/configure.ac index 72f9882..b07f4ea 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.57]) -AC_INIT([InputProto], [1.4.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) +AC_INIT([InputProto], [1.4.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) XORG_RELEASE_VERSION |