diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-05-20 10:40:50 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-05-21 11:59:17 +1000 |
| commit | 73c7398aafa050950ad614483fb0d5bdd2da97ca (patch) | |
| tree | 99b687f2918f48cb9dd5391603513328f768e57d | |
| parent | 5b5e3fa2771383a85afff679be34df19d3a4e290 (diff) | |
dix: 'namespace' HAS_OLD_SLAVE and HAS_NEW_SLAVE.
We need more flags for this in the near future, so let's namespace them now.
| -rw-r--r-- | dix/getevents.c | 4 | ||||
| -rw-r--r-- | include/events.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/dix/getevents.c b/dix/getevents.c index 2f6153736..652bd6758 100644 --- a/dix/getevents.c +++ b/dix/getevents.c @@ -201,10 +201,10 @@ CreateClassesChangedEvent(EventList* event, dce->time = ms; if (master->u.lastSlave) { - dce->flags |= HAS_OLD_SLAVE; + dce->flags |= DEVCHANGE_HAS_OLD_SLAVE; dce->old_slaveid = master->u.lastSlave->id; } - dce->flags |= HAS_NEW_SLAVE; + dce->flags |= DEVCHANGE_HAS_NEW_SLAVE; dce->new_slaveid = slave->id; if (slave->button) diff --git a/include/events.h b/include/events.h index 6803b5b7b..871932049 100644 --- a/include/events.h +++ b/include/events.h @@ -112,9 +112,9 @@ typedef struct } DeviceEvent; -/* Flags used in DeviceChangedEvent to signal if new/old slave is present */ -#define HAS_OLD_SLAVE 0x1 -#define HAS_NEW_SLAVE 0x2 +/* Flags used in DeviceChangedEvent to signal if new/old slave is present. */ +#define DEVCHANGE_HAS_OLD_SLAVE 0x1 +#define DEVCHANGE_HAS_NEW_SLAVE 0x2 /** * Sent whenever a device's capabilities have changed. |