From ca64912c02bdff486fee420a49b11f54f8f5ba08 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Thu, 26 Jan 2012 16:41:25 -0800 Subject: Namespace list api to reduce conflicts with similar system headers Rename functions/macros from list_* to xorg_list_* Rename struct from struct list to struct xorg_list. Signed-off-by: Alan Coopersmith Reviewed-by: Keith Packard In-sed-I-trust: Peter Hutterer --- dix/events.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'dix') diff --git a/dix/events.c b/dix/events.c index 04d7fb59b..e9f3685b8 100644 --- a/dix/events.c +++ b/dix/events.c @@ -1122,8 +1122,8 @@ EnqueueEvent(InternalEvent *ev, DeviceIntPtr device) int eventlen; DeviceEvent *event = &ev->device_event; - if (!list_is_empty(&syncEvents.pending)) - tail = list_last_entry(&syncEvents.pending, QdEventRec, next); + if (!xorg_list_is_empty(&syncEvents.pending)) + tail = xorg_list_last_entry(&syncEvents.pending, QdEventRec, next); NoticeTime((InternalEvent*)event); @@ -1183,13 +1183,13 @@ EnqueueEvent(InternalEvent *ev, DeviceIntPtr device) qe = malloc(sizeof(QdEventRec) + eventlen); if (!qe) return; - list_init(&qe->next); + xorg_list_init(&qe->next); qe->device = device; qe->pScreen = pSprite->hotPhys.pScreen; qe->months = currentTime.months; qe->event = (InternalEvent *)(qe + 1); memcpy(qe->event, event, eventlen); - list_append(&qe->next, &syncEvents.pending); + xorg_list_append(&qe->next, &syncEvents.pending); } /** @@ -1210,10 +1210,10 @@ PlayReleasedEvents(void) DeviceIntPtr pDev; restart: - list_for_each_entry_safe(qe, tmp, &syncEvents.pending, next) { + xorg_list_for_each_entry_safe(qe, tmp, &syncEvents.pending, next) { if (!qe->device->deviceGrab.sync.frozen) { - list_del(&qe->next); + xorg_list_del(&qe->next); pDev = qe->device; if (qe->event->any.type == ET_Motion) CheckVirtualMotion(pDev, qe, NullWindow); @@ -1297,7 +1297,7 @@ ComputeFreezes(void) FreezeThaw(dev, dev->deviceGrab.sync.other || (dev->deviceGrab.sync.state >= FROZEN)); if (syncEvents.playingEvents || - (!replayDev && list_is_empty(&syncEvents.pending))) + (!replayDev && xorg_list_is_empty(&syncEvents.pending))) return; syncEvents.playingEvents = TRUE; if (replayDev) @@ -5392,9 +5392,9 @@ InitEvents(void) syncEvents.replayDev = (DeviceIntPtr)NULL; syncEvents.replayWin = NullWindow; if (syncEvents.pending.next) - list_for_each_entry_safe(qe, tmp, &syncEvents.pending, next) + xorg_list_for_each_entry_safe(qe, tmp, &syncEvents.pending, next) free(qe); - list_init(&syncEvents.pending); + xorg_list_init(&syncEvents.pending); syncEvents.playingEvents = FALSE; syncEvents.time.months = 0; syncEvents.time.milliseconds = 0; /* hardly matters */ -- cgit v1.2.3