diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-02-25 15:32:53 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-03-03 16:09:38 +1000 |
| commit | 60b2d114d06617ca60c2905373829299dc051c7f (patch) | |
| tree | 26528ebb8a59e74556755d99dd0d80d57bad7168 /src | |
| parent | c0e3fef8cc7f1953377f61b80d9b8a5ce2fcf2b7 (diff) | |
Move current XI2 stuff out of XInput.h, into XInput2.h
This means XInput2.h is rather messy, but it also means we can leave XInput.h
untouched for the XI2 rework.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 3 | ||||
| -rw-r--r-- | src/XChDevHier.c | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 41807eb..7279922 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -66,6 +66,7 @@ AM_CFLAGS = -I$(top_srcdir)/include \ libXi_la_LDFLAGS = -version-number 6:0:0 -no-undefined libXiincludedir = $(includedir)/X11/extensions -libXiinclude_HEADERS = $(top_srcdir)/include/X11/extensions/XInput.h +libXiinclude_HEADERS = $(top_srcdir)/include/X11/extensions/XInput.h \ + $(top_srcdir)/include/X11/extensions/XInput2.h EXTRA_DIST = XFreeLst.c diff --git a/src/XChDevHier.c b/src/XChDevHier.c index 4d5fc14..d157415 100644 --- a/src/XChDevHier.c +++ b/src/XChDevHier.c @@ -30,10 +30,11 @@ in this Software without prior written authorization from The Open Group. * device is attached to which master, etc. */ +#include <stdint.h> #include <X11/extensions/XI.h> -#include <X11/extensions/XIproto.h> +#include <X11/extensions/XI2proto.h> #include <X11/Xlibint.h> -#include <X11/extensions/XInput.h> +#include <X11/extensions/XInput2.h> #include <X11/extensions/extutil.h> #include "XIint.h" |