diff options
| author | Keith Packard <keithp@keithp.com> | 2013-01-24 11:05:11 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2013-01-24 11:05:11 -0800 |
| commit | eca89c1163e5ef5d034d44773c0863fb9b52697c (patch) | |
| tree | 5ac3f7c49cb6083505292b32dd41f3cab5b4c2f4 | |
| parent | 419bc9af098b0c6f2a1ba646a007a721cd87e316 (diff) | |
| parent | 7fe5e6dfa5c1e71d8b7540b28c1d508687a2fbee (diff) | |
Merge branch 'master' into fd-passingfd-passing
| -rw-r--r-- | config/udev.c | 2 | ||||
| -rw-r--r-- | include/inputstr.h | 2 | ||||
| -rw-r--r-- | include/protocol-versions.h | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/config/udev.c b/config/udev.c index 454838f4c..de8924143 100644 --- a/config/udev.c +++ b/config/udev.c @@ -267,7 +267,7 @@ device_removed(struct udev_device *device) if (strncmp(sysname,"card", 4) != 0) return; - ErrorF("removing GPU device %s %d\n", syspath, path); + ErrorF("removing GPU device %s %s\n", syspath, path); if (!path) return; diff --git a/include/inputstr.h b/include/inputstr.h index fc21913e1..48a29bede 100644 --- a/include/inputstr.h +++ b/include/inputstr.h @@ -327,8 +327,6 @@ typedef struct _TouchPointInfo { size_t history_size; /* Size of history in elements */ } TouchPointInfoRec; -typedef struct _TouchListener TouchListener; - typedef struct _DDXTouchPointInfo { uint32_t client_id; /* touch ID as seen in client events */ Bool active; /* whether or not the touch is active */ diff --git a/include/protocol-versions.h b/include/protocol-versions.h index cb8e213bb..10f5117f2 100644 --- a/include/protocol-versions.h +++ b/include/protocol-versions.h @@ -127,7 +127,7 @@ /* X Input */ #define SERVER_XI_MAJOR_VERSION 2 -#define SERVER_XI_MINOR_VERSION 2 +#define SERVER_XI_MINOR_VERSION 3 /* XKB */ #define SERVER_XKB_MAJOR_VERSION 1 |