summaryrefslogtreecommitdiff
path: root/include/inputstr.h
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2012-02-11 15:36:43 +1300
committerKeith Packard <keithp@keithp.com>2012-02-11 15:36:43 +1300
commit42b6756463ee0476340656707f1088dc6c2fd220 (patch)
tree1a1e21899ff96be6f6b8291297db28d7114601cc /include/inputstr.h
parent7674d00b04da5cf73cfa5c7ed1d3a9f42b59960e (diff)
parentca64912c02bdff486fee420a49b11f54f8f5ba08 (diff)
Merge remote-tracking branch 'alanc/master'
Diffstat (limited to 'include/inputstr.h')
-rw-r--r--include/inputstr.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/inputstr.h b/include/inputstr.h
index 4e28bc71d..86db811fc 100644
--- a/include/inputstr.h
+++ b/include/inputstr.h
@@ -623,7 +623,7 @@ extern _X_EXPORT InputInfo inputInfo;
/* for keeping the events for devices grabbed synchronously */
typedef struct _QdEvent *QdEventPtr;
typedef struct _QdEvent {
- struct list next;
+ struct xorg_list next;
DeviceIntPtr device;
ScreenPtr pScreen; /* what screen the pointer was on */
unsigned long months; /* milliseconds is in the event */
@@ -639,7 +639,7 @@ typedef struct _QdEvent {
* replayed and processed as if they would come from the device directly.
*/
typedef struct _EventSyncInfo {
- struct list pending;
+ struct xorg_list pending;
/** The device to replay events for. Only set in AllowEvents(), in which
* case it is set to the device specified in the request. */